Update cmake for git version

Jackarain · Jun 5, 2024 · b5debaa · b5debaa
1 parent 461aded
commit b5debaa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,8 +79,12 @@ option(ENABLE_LINKE_TO_LIBATOMIC	"link to libatomic.so - some platform requires
 if (ENABLE_GIT_VERSION)
 	find_package(Git)
 	gitGetVersion(${CMAKE_CURRENT_SOURCE_DIR} proxy)
-	set(VERSION_GIT ${proxy_WC_REVISION_HASH})
-	string(TIMESTAMP PVERSION "${VERSION_GIT} (%Y-%m-%d %H:%M:%S)")
+	string(STRIP "${proxy_WC_REVISION_HASH}" VERSION_GIT)
+	if (VERSION_GIT STREQUAL "")
+		string(TIMESTAMP PVERSION "(%Y-%m-%d %H:%M:%S)")
+	else()
+		string(TIMESTAMP PVERSION "${VERSION_GIT} (%Y-%m-%d %H:%M:%S)")
+	endif()
 	message(STATUS "Git Version: ${PVERSION}")
 endif()
 

diff --git a/cmake/FindGit.cmake b/cmake/FindGit.cmake
@@ -176,8 +176,8 @@ find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
 
 function(gitGetVersion source_dir prefix)
 	if(GIT_FOUND)
+    GIT_WC_INFO(${source_dir} ${prefix})
     if ("${GIT_error}" STREQUAL "")
-      GIT_WC_INFO(${source_dir} ${prefix})
       if(NOT ${prefix}_WC_REVISION_HASH)
         set(${prefix}_WC_REVISION_HASH "n/a")
       endif()