ci: fix master version generation

jahnf · Oct 13, 2023 · 8990646 · 8990646
1 parent 372f5e8
commit 8990646
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmake/modules/GitVersion.cmake b/cmake/modules/GitVersion.cmake
@@ -255,6 +255,7 @@ function(get_version_info prefix directory)
     math(EXPR CALCULATED_GIT_DISTANCE "${${prefix}_VERSION_DISTANCE}+${${prefix}_VERSION_DISTANCE_OFFSET}")
     set(${prefix}_VERSION_DISTANCE ${CALCULATED_GIT_DISTANCE})
     set(${prefix}_VERSION_DISTANCE ${CALCULATED_GIT_DISTANCE} PARENT_SCOPE)
+    message(STATUS "DISTANCE IS ${${prefix}_VERSION_DISTANCE}")
 
     execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
       RESULT_VARIABLE resultSH
@@ -321,15 +322,18 @@ function(get_version_info prefix directory)
   if(NOT ${${prefix}_VERSION_PATCH} EQUAL 0)
     set(VERSION_STRING "${VERSION_STRING}.${${prefix}_VERSION_PATCH}")
   endif()
-  if(NOT ON_MASTER OR NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0)
+  if(NOT ON_MASTER OR NOT ${${prefix}_VERSION_DISTANCE} EQUAL ${${prefix}_VERSION_DISTANCE_OFFSET})
     set(VERSION_STRING "${VERSION_STRING}-${${prefix}_VERSION_FLAG}")
     set(VERSION_STRING_FULL "${VERSION_STRING_FULL}-${${prefix}_VERSION_FLAG}")
     endif()
   if(NOT ${${prefix}_VERSION_FLAG} STREQUAL "")
     set(VERSION_STRING "${VERSION_STRING}.")
     set(VERSION_STRING_FULL "${VERSION_STRING_FULL}.")
   endif()
-  if(NOT ON_MASTER OR (NOT ON_MASTER AND NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0))
+  if(NOT ON_MASTER OR (NOT ON_MASTER AND NOT ${${prefix}_VERSION_DISTANCE} EQUAL ${${prefix}_VERSION_DISTANCE_OFFSET}))
+    set(VERSION_STRING "${VERSION_STRING}${${prefix}_VERSION_DISTANCE}")
+    set(VERSION_STRING_FULL "${VERSION_STRING_FULL}${${prefix}_VERSION_DISTANCE}")
+  elseif(ON_MASTER AND NOT ${${prefix}_VERSION_DISTANCE} EQUAL ${${prefix}_VERSION_DISTANCE_OFFSET})
     set(VERSION_STRING "${VERSION_STRING}${${prefix}_VERSION_DISTANCE}")
     set(VERSION_STRING_FULL "${VERSION_STRING_FULL}${${prefix}_VERSION_DISTANCE}")
   endif()
@@ -390,7 +394,7 @@ function(add_version_info_custom_prefix target prefix directory)
     set(VERSION_DISTANCE_OFFSET ${TARGET_VDIST_OFFSET})
   endif()
   set(${prefix}_VERSION_DISTANCE_OFFSET ${VERSION_DISTANCE_OFFSET})
-  
+
   include(ArchiveVersionInfo_${prefix} OPTIONAL RESULT_VARIABLE ARCHIVE_VERSION_PRESENT)
   if(ARCHIVE_VERSION_PRESENT AND ${prefix}_VERSION_SUCCESS)
     message(STATUS "Info: Version information from archive file.")