Skip to content
Snippets Groups Projects
Commit 3abf077a authored by Pierre Aubert's avatar Pierre Aubert
Browse files

Take account tag in __PROGRAM_VERSION__ if it does exist

parent c0751144
No related branches found
No related tags found
No related merge requests found
Pipeline #293664 passed
Stage: BuildTestinstall
Stage: DocCoverage
Stage: deploy
Hide whitespace changes
Inline Side-by-side
cmake/create_version.cmake
+ 5
− 1
View file @ 3abf077a
...@@ -20,7 +20,11 @@ function(create_version projectName projectVersion) ...@@ -20,7 +20,11 @@ function(create_version projectName projectVersion)
OUTPUT_QUIET ERROR_QUIET) OUTPUT_QUIET ERROR_QUIET)
if(CURRENT_TIMESTAMP_OK EQUAL 0 AND CURRENT_BRANCH_OK EQUAL 0) if(CURRENT_TIMESTAMP_OK EQUAL 0 AND CURRENT_BRANCH_OK EQUAL 0)
set(PROGRAM_LONG_VERSION "(${CURRENT_BRANCH} ${CURRENT_TIMESTAMP})") if(CURRENT_TAG_OK EQUAL 0)
set(PROGRAM_LONG_VERSION "(${CURRENT_BRANCH} ${CURRENT_TIMESTAMP} , tag: '${CURRENT_TAG}')")
else()
set(PROGRAM_LONG_VERSION "(${CURRENT_BRANCH} ${CURRENT_TIMESTAMP})")
endif()
endif() endif()
message(STATUS "Program ${projectName} version ${projectVersion}") message(STATUS "Program ${projectName} version ${projectVersion}")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment