diff --git a/CMake/ClioVersion.cmake b/CMake/ClioVersion.cmake index 591fcee9..ff61642a 100644 --- a/CMake/ClioVersion.cmake +++ b/CMake/ClioVersion.cmake @@ -5,21 +5,27 @@ find_package (Git REQUIRED) set (GIT_COMMAND rev-parse --short HEAD) -execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE REV OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE REV OUTPUT_STRIP_TRAILING_WHITESPACE) set (GIT_COMMAND branch --show-current) -execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) if (BRANCH STREQUAL "") set (BRANCH "dev") endif () -if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-- +if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name YYYYMMDDHMS-- execute_process (COMMAND date +%Y%m%d%H%M%S OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE) set (VERSION "${DATE}-${BRANCH}-${REV}") else () set (GIT_COMMAND describe --tags) - execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} OUTPUT_VARIABLE TAG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process (COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE TAG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) set (VERSION "${TAG_VERSION}-${REV}") endif ()