From b974929b5de5686e93afc6012484eb9c5528a0d9 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Fri, 13 Dec 2019 17:24:28 -0400 Subject: [PATCH] Pass debian version as GIT_VERSION --- ...7-Pass-debian-version-as-GIT_VERSION.patch | 28 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 debian/patches/0007-Pass-debian-version-as-GIT_VERSION.patch diff --git a/debian/patches/0007-Pass-debian-version-as-GIT_VERSION.patch b/debian/patches/0007-Pass-debian-version-as-GIT_VERSION.patch new file mode 100644 index 000000000..0ee893584 --- /dev/null +++ b/debian/patches/0007-Pass-debian-version-as-GIT_VERSION.patch @@ -0,0 +1,28 @@ +From: Jason Rhinelander +Date: Fri, 13 Dec 2019 17:23:41 -0400 +Subject: Pass debian version as GIT_VERSION + +--- + cmake/Version.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/cmake/Version.cmake b/cmake/Version.cmake +index 5cded3b..ee60154 100644 +--- a/cmake/Version.cmake ++++ b/cmake/Version.cmake +@@ -1,4 +1,8 @@ + ++if(GIT_VERSION) ++ set(VERSIONTAG "${GIT_VERSION}") ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp") ++else() + find_package(Git QUIET) + if(GIT_FOUND OR Git_FOUND) + message(STATUS "Found Git: ${GIT_EXECUTABLE}") +@@ -17,5 +21,6 @@ else() + set(VERSIONTAG "nogit") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/constants/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp") + endif() ++endif() + + add_custom_target(genversion DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/constants/version.cpp") diff --git a/debian/patches/series b/debian/patches/series index eb4c83896..f176dd7e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0004-Make-root-bootstraps-to-system-path.patch 0005-Move-default-user-group-into-deb-patch.patch 0006-Add-no-resolvconf-hack-to-default-config.patch +0007-Pass-debian-version-as-GIT_VERSION.patch