Commit 1870787d authored by Julie Brossard's avatar Julie Brossard

[REFAC] Switched tag and always options

parent 29e1c136
Pipeline #5488 passed with stages
in 63 minutes and 33 seconds
...@@ -43,14 +43,14 @@ function(get_version root_repo_dir project_name project_version_string project_v ...@@ -43,14 +43,14 @@ function(get_version root_repo_dir project_name project_version_string project_v
endif() endif()
# Get last tag from git # Get last tag from git
execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --tags execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --always
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE ${PROJECT_NAME}_VERSION_STRING OUTPUT_VARIABLE ${PROJECT_NAME}_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS ${${PROJECT_NAME}_VERSION_STRING}) message(STATUS ${${PROJECT_NAME}_VERSION_STRING})
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags execute_process(COMMAND ${GIT_EXECUTABLE} describe --always
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE ${PROJECT_NAME}_VERSION_STRING_2 OUTPUT_VARIABLE ${PROJECT_NAME}_VERSION_STRING_2
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
......
Markdown is supported
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