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.
This commit is contained in:
Geert Janssens 2019-08-26 12:17:39 +02:00
parent 8c2f5fb7a2
commit cc222515a3
3 changed files with 3 additions and 4 deletions

View File

@ -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})

View File

@ -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