get branch name

Former-commit-id: eb75eb1a41845c294479a8e15176feac629be9a8

get branch name
Former-commit-id: eb75eb1a41845c294479a8e15176feac629be9a8
a4f0f4bd · starlord · 2aa7176d · a4f0f4bd
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

core/CMakeLists.txt core/CMakeLists.txt +4 -1

未找到文件。
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -32,7 +32,10 @@ string(REGEX REPLACE "\n" "" BUILD_TIME ${BUILD_TIME})
 message(STATUS "Build time = ${BUILD_TIME}")

 MACRO (GET_GIT_BRANCH_NAME GIT_BRANCH_NAME)
-    execute_process(COMMAND "git" symbolic-ref --short HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})
+    execute_process(COMMAND "git" rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})
+    if(GIT_BRANCH_NAME STREQUAL "")
+        execute_process(COMMAND "git" symbolic-ref --short -q HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})
+    endif()
 ENDMACRO (GET_GIT_BRANCH_NAME)

 GET_GIT_BRANCH_NAME(GIT_BRANCH_NAME)