add debug version with git hash

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1952955b39d9ac6b73be1d54e9365083ee6f4d70..8ffb3ce0bca305356d7b4f1a041653732b68df67 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,15 +1,11 @@
 find_package(Git)
 if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
-       execute_process(COMMAND ${GIT_EXECUTABLE} branch --show-current
+       execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-               OUTPUT_VARIABLE CURRENT_BRANCH
-               OUTPUT_STRIP_TRAILING_WHITESPACE)
-       execute_process(COMMAND ${GIT_EXECUTABLE} rev-list --count master..${CURRENT_BRANCH}
-               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-               OUTPUT_VARIABLE PROJECT_VERSION_TWEAK
+               OUTPUT_VARIABLE GIT_HASH
                OUTPUT_STRIP_TRAILING_WHITESPACE)
        if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-               set(PROJECT_VERSION ${PROJECT_VERSION}.${PROJECT_VERSION_TWEAK})
+               set(PROJECT_VERSION ${PROJECT_VERSION}-${GIT_HASH})
                message(STATUS "Debug PROJECT_VERSION: ${PROJECT_VERSION}")
        endif()
 endif()