RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Improve readability

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-09-28 02:02:46 +02:00
parent 82413fd85c
commit 67227f2c03
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -27,6 +27,8 @@ set(VERSION_SUFFIX "")
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
set(GIT_RESULT "") set(GIT_RESULT "")
set(GIT_OUTPUT "") set(GIT_OUTPUT "")
# Get commit index
execute_process( execute_process(
COMMAND git rev-list --count --topo-order ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}..HEAD COMMAND git rev-list --count --topo-order ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}..HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
@ -37,6 +39,8 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
if(GIT_RESULT EQUAL 0) if(GIT_RESULT EQUAL 0)
set(VERSION_TWEAK ${GIT_OUTPUT}) set(VERSION_TWEAK ${GIT_OUTPUT})
endif() endif()
# Get commit hash
execute_process( execute_process(
COMMAND git rev-parse --short=8 HEAD COMMAND git rev-parse --short=8 HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
@ -45,11 +49,13 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE ERROR_QUIET
) )
if(GIT_RESULT EQUAL 0) if(GIT_RESULT EQUAL 0)
set(PROJECT_COMMIT ${GIT_OUTPUT}) set(VERSION_COMMIT ${GIT_OUTPUT})
else()
set(VERSION_COMMIT "")
endif() endif()
endif() endif()
if(PROJECT_COMMIT) if(VERSION_COMMIT)
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}-${PROJECT_COMMIT}") set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}-${VERSION_COMMIT}")
else() else()
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}") set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}")
endif() endif()

9
templates/version.hpp.in
View File

@ -30,14 +30,15 @@
#define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull #define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull
#define STREAMFX_MASK_UPDATE 0xFFFFFFFFFFFF0000ull #define STREAMFX_MASK_UPDATE 0xFFFFFFFFFFFF0000ull
#define STREAMFX_COMMIT "@PROJECT_COMMIT@" #define STREAMFX_COMMIT "@VERSION_COMMIT@"
#define STREAMFX_VERSION \
STREAMFX_MAKE_VERSION(STREAMFX_VERSION_MAJOR, STREAMFX_VERSION_MINOR, STREAMFX_VERSION_PATCH, \
STREAMFX_VERSION_BUILD)
#define STREAMFX_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ #define STREAMFX_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
#define STREAMFX_VERSION_MINOR @PROJECT_VERSION_MINOR@ #define STREAMFX_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define STREAMFX_VERSION_PATCH @PROJECT_VERSION_PATCH@ #define STREAMFX_VERSION_PATCH @PROJECT_VERSION_PATCH@
#define STREAMFX_VERSION_BUILD @PROJECT_VERSION_TWEAK@ #define STREAMFX_VERSION_BUILD @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@ #define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_SUFFIX "@VERSION_SUFFIX@" #define STREAMFX_VERSION_SUFFIX "@VERSION_SUFFIX@"
#define STREAMFX_VERSION \ #define STREAMFX_VERSION_COMMIT "@VERSION_COMMIT@"
STREAMFX_MAKE_VERSION(STREAMFX_VERSION_MAJOR, STREAMFX_VERSION_MINOR, STREAMFX_VERSION_PATCH, \
STREAMFX_VERSION_BUILD)
#define STREAMFX_VERSION_STRING "@VERSION_STRING@" #define STREAMFX_VERSION_STRING "@VERSION_STRING@"