diff options
| author | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-04 18:42:03 +0700 |
|---|---|---|
| committer | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-04 18:42:03 +0700 |
| commit | 16e5870a2615208fe07d2c3c5e1a90b796bb720c (patch) | |
| tree | be3f10bbb395bd8f1d609f5d2dd53ae406ddf11c | |
| parent | 3c9bd1dc5df8c35f8fd48e4a3f844f0aa1383013 (diff) | |
simplified cmake for package versioning
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 39c84f509c..8b383daefb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,10 +90,7 @@ IF(STELLARIUM_RELEASE_BUILD) SET(SERIES "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}") ELSE() SET(SERIES "head") -ENDIF() - -########### Get revision number for non-release builds ########### -IF(NOT STELLARIUM_RELEASE_BUILD) + ########### Get revision number for non-release builds ########### # Hack until CMake detection for Git is finished IF(WIN32) FIND_FILE(GITCMD git.exe) @@ -105,7 +102,6 @@ IF(NOT STELLARIUM_RELEASE_BUILD) IF(EXISTS ${GITCMD}) EXECUTE_PROCESS(COMMAND git rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE GIT_ERROR) EXECUTE_PROCESS(COMMAND git log -1 --pretty=format:%h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE GIT_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE GIT_ERROR) - #EXECUTE_PROCESS(COMMAND git rev-list --count ${GIT_BRANCH} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE GIT_COMMITS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE GIT_ERROR) EXECUTE_PROCESS(COMMAND git describe --tags --abbrev=0 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE GIT_TAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE GIT_ERROR) EXECUTE_PROCESS(COMMAND git log ${GIT_TAGS}..HEAD --pretty=oneline COMMAND wc -l WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE GIT_COMMITS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE GIT_ERROR) # remove all whitespaces @@ -118,7 +114,7 @@ IF(NOT STELLARIUM_RELEASE_BUILD) ADD_DEFINITIONS(-DGIT_BRANCH="${GIT_BRANCH}") # better way to numbering SET(WINDOWS_PACKAGE_VERSION "${VERSION}.${GIT_COMMITS}") - ENDIF() + ENDIF() ELSE() STRING(TIMESTAMP TODAY "%j%H%M") SET(PACKAGE_VERSION "${VERSION}-${TODAY}") |