gnucash maint: Minor tweaks to appdata file generation

Geert Janssens gjanssens at code.gnucash.org
Mon Aug 26 03:29:15 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/8c2f5fb7 (commit)
	from  https://github.com/Gnucash/gnucash/commit/4de2e2b9 (commit)



commit 8c2f5fb7a2d98e9746d2caeb238ce6273b7a4307
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 09:24:19 2019 +0200

    Minor tweaks to appdata file generation
    
    * Use cmake's built-in copy command rather than an external one
    * depend directly on gnc-vcs-info.h rather than the global gnc-vcs-info-target
      The latter won't trigger a rerun of the command if gnc-vcs-info.h already exists
      regardless of whether it had changed.

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 4b796201e..312ce277e 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -166,11 +166,11 @@ if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     # Fall back to providing an unmerged (and hence untranslated) appdata file.
     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
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+           ${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
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
         )
 else()
     # FIXME: where does LC_ALL=C come from?
@@ -182,7 +182,7 @@ else()
                 --xml --template ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
                 -d ${CMAKE_SOURCE_DIR}/po
                 -o gnucash.appdata.xml
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
     )
 endif()
 



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



More information about the gnucash-changes mailing list