1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
|
From: Bastian Germann <bage@debian.org>
Date: Thu, 24 Aug 2023 15:57:25 +0000
Description: Fix version string for builds without git
---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54de968..0b953c1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,10 +32,10 @@ file( GLOB checkit_tiff_risk_SOURCES
#
execute_process( COMMAND git rev-list HEAD --count OUTPUT_VARIABLE REPO_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE )
execute_process( COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE BUILD_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process( COMMAND git describe --tags OUTPUT_VARIABLE BUILD_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process( COMMAND dpkg-parsechangelog -SVersion WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/.. OUTPUT_VARIABLE BUILD_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process( COMMAND git rev-parse HEAD OUTPUT_VARIABLE BUILD_REV_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process( COMMAND git describe --long --tags --dirty --always OUTPUT_VARIABLE BUILD_REV_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
-add_definitions(-DVERSION="${BUILD_BRANCH}_${BUILD_TAG}")
+add_definitions(-DVERSION="debian_${BUILD_TAG}")
add_definitions(-DREPO_REVISION="${REPO_REVISION}")
add_definitions(-D_GNU_SOURCE)
|