[Commit-gnuradio] [gnuradio] 05/05: cmake: fix for when tree is git but git describe fails

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 3d9ccb49432e6ff33c568c89e88fc431111abb3f
Author: Nicholas Corgan <address@hidden>
Date:   Mon Aug 1 13:16:42 2016 -0700

    cmake: fix for when tree is git but git describe fails
---
 cmake/Modules/GrVersion.cmake | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake
index dceac67..414c34d 100644
--- a/cmake/Modules/GrVersion.cmake
+++ b/cmake/Modules/GrVersion.cmake
@@ -33,6 +33,16 @@ set(MAINT_VERSION ${VERSION_INFO_MAINT_VERSION})
 ########################################################################
 find_package(Git)
 
+MACRO(create_manual_git_describe)
+    if(NOT GR_GIT_COUNT)
+        set(GR_GIT_COUNT "compat-xxx")
+    endif()
+    if(NOT GR_GIT_HASH)
+        set(GR_GIT_HASH "xunknown")
+    endif()
+    set(GIT_DESCRIBE 
"v${MAJOR_VERSION}.${API_COMPAT}-${GR_GIT_COUNT}-${GR_GIT_HASH}")
+ENDMACRO()
+
 if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
     message(STATUS "Extracting version information from git describe...")
     execute_process(
@@ -40,14 +50,11 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
         OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
-else()
-    if(NOT GR_GIT_COUNT)
-        set(GR_GIT_COUNT "compat-xxx")
-    endif()
-    if(NOT GR_GIT_HASH)
-        set(GR_GIT_HASH "xunknown")
+    if(GIT_DESCRIBE STREQUAL "")
+        create_manual_git_describe()
     endif()
-    set(GIT_DESCRIBE 
"v${MAJOR_VERSION}.${API_COMPAT}-${GR_GIT_COUNT}-${GR_GIT_HASH}")
+else()
+    create_manual_git_describe()
 endif()
 
 ########################################################################