From 7a16e048223af70b2373ce1516b4448647a8bd2f Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Sun, 16 Feb 2020 20:02:33 +0100
Subject: [PATCH] Use GNUCASH_BUILD_ID in the gnucash appdata file

Add it to the release version if
- it was defined
- and it's not the same as GNC_VCS_REV
---
 cmake/insert-vcs-data.cmake  | 5 +++++
 gnucash/gnome/CMakeLists.txt | 1 +
 2 files changed, 6 insertions(+)

diff --git a/cmake/insert-vcs-data.cmake b/cmake/insert-vcs-data.cmake
index 2e0ce92ca0..bcd95ffd38 100644
--- a/cmake/insert-vcs-data.cmake
+++ b/cmake/insert-vcs-data.cmake
@@ -13,4 +13,9 @@
 
 include (${SRC_DIR}/cmake/version-info2env.cmake)
 versioninfo2env (${VCS_INFO_FILE})
+
+
+if (GNUCASH_BUILD_ID AND NOT "${GNUCASH_BUILD_ID}" STREQUAL "${GNC_VCS_REV}")
+    set (GNC_VCS_REV "${GNC_VCS_REV} (${GNUCASH_BUILD_ID})")
+endif()
 configure_file(${SRC} ${DST})
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 9fd607d2e0..2dee010354 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -187,6 +187,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -D SRC=${GNC_APPDATA_IN}
                              -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml
                              -D VCS_INFO_FILE=${VCS_INFO_FILE}
+                             -D GNUCASH_BUILD_ID=${GNUCASH_BUILD_ID}
                              -D PROJECT_VERSION=${PROJECT_VERSION}
                              -D SRC_DIR=${CMAKE_SOURCE_DIR}
                              -P ${CMAKE_SOURCE_DIR}/cmake/insert-vcs-data.cmake)