From 8a4e6894fb16a3535aacc924286f70bac62bad77 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 2 Mar 2023 22:05:22 +0100 Subject: [PATCH] Fixed git version extraction --- cmake/GitVersion.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake index 367732b7..98f4b027 100644 --- a/cmake/GitVersion.cmake +++ b/cmake/GitVersion.cmake @@ -6,16 +6,15 @@ function(setup_git_version) execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --always --abbrev=7 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE GIT_VERSION_FROM_TAG + OUTPUT_VARIABLE GIT_VERSION RESULT_VARIABLE GIT_ERROR_CODE OUTPUT_STRIP_TRAILING_WHITESPACE ) endif(GIT_EXECUTABLE) - set(GIT_VERSION ${GIT_VERSION_FROM_TAG} PARENT_SCOPE) endif(NOT DEFINED GIT_VERSION) if(NOT DEFINED GIT_VERSION) - set(GIT_VERSION "0.0.0-unknown" PARENT_SCOPE) + set(GIT_VERSION "0.0.0-unknown") endif(NOT DEFINED GIT_VERSION) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)" @@ -23,4 +22,6 @@ function(setup_git_version) set(GIT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE) set(GIT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE) set(GIT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE) + set(GIT_VERSION ${GIT_VERSION} PARENT_SCOPE) + endfunction() \ No newline at end of file