From e29500fc6ddfb9063083c8d2acfd0d9559f47700 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Wed, 22 May 2019 09:52:36 +0200 Subject: [PATCH] cmake: sdrangel_VERSION_SUFFIX add the number of commits from last tag Example: SDRangel Version: 4.8.0-53-gc24a37d01 --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db92deef5..26dfcc32c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,14 +55,15 @@ add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"") find_package(Git) if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/") - execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD + execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT res) - set(sdrangel_VERSION_SUFFIX "-${out}") + string(REGEX REPLACE "^v([0-9]+)\.([0-9]+)\.([0-9]+)-" "" git_commit ${out}) + set(sdrangel_VERSION_SUFFIX "-${git_commit}") endif() endif()