diff options
| author | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-04 17:38:59 +0700 |
|---|---|---|
| committer | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-04 17:38:59 +0700 |
| commit | 3c9bd1dc5df8c35f8fd48e4a3f844f0aa1383013 (patch) | |
| tree | 1a80c2c57244d63374e52d02d0b4d16a5dd111a9 | |
| parent | 47b08994574a2ecc2dea4ec7afc31f8c7231ad50 (diff) | |
[cmake] improve version numbering
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 383376122d..39c84f509c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,11 @@ 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 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 + STRING(REPLACE " " "" GIT_COMMITS ${GIT_COMMITS}) IF(GIT_REVISION) # Let's use short hash in all cases STRING(SUBSTRING ${GIT_REVISION} 0 7 REVISION) @@ -114,7 +118,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}") @@ -125,6 +129,7 @@ IF(NOT STELLARIUM_RELEASE_BUILD) SET(PACKAGE_VERSION "${STELLARIUM_VERSION}") ADD_DEFINITIONS(-DSTELLARIUM_VERSION="${STELLARIUM_VERSION}") ENDIF() + #MESSAGE(STATUS "Full version of Stellarium ${WINDOWS_PACKAGE_VERSION}") ENDIF() MESSAGE(STATUS "Building Stellarium ${PACKAGE_VERSION} (Mode: ${CMAKE_BUILD_TYPE})") |