[Commit-gnuradio] [gnuradio] 06/10: cmake: when not release and no GIT_EXECUTABLE nad not .git directory in the archive, allow external overriding of version info via GR_GIT_COUNT and GR_GIT_HASH, similar to what UHD allows.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b094d761aa3fd6021ddadae2dd6e715efc4ac246
Author: Michael Dickens <address@hidden>
Date:   Wed Feb 17 21:53:26 2016 -0500

    cmake: when not release and no GIT_EXECUTABLE nad not .git directory in the 
archive, allow external overriding of version info via GR_GIT_COUNT and 
GR_GIT_HASH, similar to what UHD allows.
---
 cmake/Modules/GrVersion.cmake | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake
index bafd0a7..dceac67 100644
--- a/cmake/Modules/GrVersion.cmake
+++ b/cmake/Modules/GrVersion.cmake
@@ -41,7 +41,13 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
 else()
-    set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown")
+    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}")
 endif()
 
 ########################################################################