Skip to content

Commit

Permalink
Fix in-tree builds after the appdata file changes
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
gjanssens committed Aug 26, 2019
1 parent 8c2f5fb commit cc22251
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions gnucash/gnome/CMakeLists.txt
Expand Up @@ -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}
Expand Down Expand Up @@ -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})
File renamed without changes.
1 change: 0 additions & 1 deletion po/POTFILES.in
Expand Up @@ -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
Expand Down

0 comments on commit cc22251

Please sign in to comment.