gnucash maint: Fix in-tree builds after the appdata file changes
Geert Janssens
gjanssens at code.gnucash.org
Mon Aug 26 06:17:50 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/cc222515 (commit)
from https://github.com/Gnucash/gnucash/commit/8c2f5fb7 (commit)
commit cc222515a38fcb34cdd96a38e7da72f313a7c81e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Aug 26 12:17:39 2019 +0200
Fix in-tree builds after the appdata file changes
We don't recommend this as it risks tainted build environments. However if
you know what you're doing it should still work. In particular sandboxed systems
such as flatpak don't have this problem and hence they do build in-tree.
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 312ce277e..444f20439 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -154,8 +154,8 @@ install(TARGETS gnc-gnome
# No headers to install
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
- COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in.in ${VCS_INFO_FILE}
+ COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in.in
-D DST=${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-D VCS_INFO_FILE=${VCS_INFO_FILE}
-D SRC_DIR=${CMAKE_SOURCE_DIR}
@@ -217,5 +217,5 @@ add_custom_target(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
set_dist_list(gnome_DIST
- CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
+ CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in.in
similarity index 100%
rename from gnucash/gnome/gnucash.appdata.xml.in
rename to gnucash/gnome/gnucash.appdata.xml.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67d490c29..09ca6360d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -89,7 +89,6 @@ gnucash/gnome/gnc-plugin-register2.c
gnucash/gnome/gnc-plugin-register.c
gnucash/gnome/gnc-split-reg2.c
gnucash/gnome/gnc-split-reg.c
-gnucash/gnome/gnucash.appdata.xml.in
gnucash/gnome/gnucash.desktop.in.in
gnucash/gnome/reconcile-view.c
gnucash/gnome/search-owner.c
Summary of changes:
gnucash/gnome/CMakeLists.txt | 6 +++---
gnucash/gnome/{gnucash.appdata.xml.in => gnucash.appdata.xml.in.in} | 0
po/POTFILES.in | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
rename gnucash/gnome/{gnucash.appdata.xml.in => gnucash.appdata.xml.in.in} (100%)
More information about the gnucash-changes
mailing list