fix: version should retrieve from tags output (#250)

Signed-off-by: msclock <msclock@qq.com>
serious-scaffold · May 14, 2024 · 0a309fc · 0a309fc
1 parent f677e63
commit 0a309fc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/cmake/ConfigureVersion.cmake b/cmake/ConfigureVersion.cmake
@@ -13,15 +13,22 @@ find_package(robotology-cmake-ycm REQUIRED)
 include(robotology-cmake-ycm/modules/GitInfo)
 include(robotology-cmake-ycm/modules/ExtractVersion)
 
+# Retrieve the git commit information to CMAKE_PROJECT* variables
 git_commit_info(SOURCE_DIR ${CMAKE_SOURCE_DIR} PREFIX CMAKE_PROJECT)
-if(NOT CMAKE_PROJECT_GIT_COMMIT_DESCRIBE)
+
+if(NOT CMAKE_PROJECT_GIT_COMMIT_TAG)
   set(CMAKE_PROJECT_VERSION "0.0.0.0")
 else()
-  string(REGEX MATCH [[v?(.*)$]] matches_out
-               "${CMAKE_PROJECT_GIT_COMMIT_DESCRIBE}")
-  set(CMAKE_PROJECT_VERSION ${CMAKE_MATCH_1})
-  string(REPLACE "-" "." CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
+  set(CMAKE_PROJECT_VERSION "${CMAKE_PROJECT_GIT_COMMIT_TAG}")
+
+  if(CMAKE_PROJECT_GIT_COMMIT_TAG_REVISION)
+    set(CMAKE_PROJECT_VERSION
+        "${CMAKE_PROJECT_VERSION}.${CMAKE_PROJECT_GIT_COMMIT_TAG_REVISION}")
+  endif()
+
+  string(REGEX REPLACE "^v" "" CMAKE_PROJECT_VERSION "${CMAKE_PROJECT_VERSION}")
 endif()
 
+# Set major, minor, patch and tweak version numbers
 extract_version(CMAKE_PROJECT CMAKE_PROJECT REVERSE_NAME)
 generate_git_header()
diff --git a/template/cmake/ConfigureVersion.cmake b/template/cmake/ConfigureVersion.cmake
@@ -13,15 +13,22 @@ find_package(robotology-cmake-ycm REQUIRED)
 include(robotology-cmake-ycm/modules/GitInfo)
 include(robotology-cmake-ycm/modules/ExtractVersion)
 
+# Retrieve the git commit information to CMAKE_PROJECT* variables
 git_commit_info(SOURCE_DIR ${CMAKE_SOURCE_DIR} PREFIX CMAKE_PROJECT)
-if(NOT CMAKE_PROJECT_GIT_COMMIT_DESCRIBE)
+
+if(NOT CMAKE_PROJECT_GIT_COMMIT_TAG)
   set(CMAKE_PROJECT_VERSION "0.0.0.0")
 else()
-  string(REGEX MATCH [[v?(.*)$]] matches_out
-               "${CMAKE_PROJECT_GIT_COMMIT_DESCRIBE}")
-  set(CMAKE_PROJECT_VERSION ${CMAKE_MATCH_1})
-  string(REPLACE "-" "." CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
+  set(CMAKE_PROJECT_VERSION "${CMAKE_PROJECT_GIT_COMMIT_TAG}")
+
+  if(CMAKE_PROJECT_GIT_COMMIT_TAG_REVISION)
+    set(CMAKE_PROJECT_VERSION
+        "${CMAKE_PROJECT_VERSION}.${CMAKE_PROJECT_GIT_COMMIT_TAG_REVISION}")
+  endif()
+
+  string(REGEX REPLACE "^v" "" CMAKE_PROJECT_VERSION "${CMAKE_PROJECT_VERSION}")
 endif()
 
+# Set major, minor, patch and tweak version numbers
 extract_version(CMAKE_PROJECT CMAKE_PROJECT REVERSE_NAME)
 generate_git_header()