gnucash maint: Bug 797377 - cmake fails on debian-8 and ubuntu-14.04...

John Ralls jralls at code.gnucash.org
Sun Aug 25 16:21:23 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/bdb85888 (commit)
	from  https://github.com/Gnucash/gnucash/commit/e8543008 (commit)



commit bdb858883cb013a08683a31b21e1baca91e52eeb
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 25 13:21:08 2019 -0700

    Bug 797377 - cmake fails on debian-8 and ubuntu-14.04...
    
    with gnucash.appdata.xml.in does not exist

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 6291f27c5..4b796201e 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -164,8 +164,14 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
 if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     # Gettext is too old to be able to merge an appdata file.
     # Fall back to providing an unmerged (and hence untranslated) appdata file.
-    configure_file (${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-                    ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml COPYONLY)
+    add_custom_command (
+        OUTPUT gnucash.appdata.xml
+        COMMAND ${CMAKE_COMMAND} -E env
+           cp ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
+              ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml
+
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
+        )
 else()
     # FIXME: where does LC_ALL=C come from?
     add_custom_command (



Summary of changes:
 gnucash/gnome/CMakeLists.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list