GnuCash uses Gnome's GSettings to store user preferences. This was not working before. wrapGAppsHook is introduced to solve this problem, but it must be tweaked to not wrap GnuCash's cli utilities for fetching financial quotes. Those are now deliberately wrapped with their Perl library dependencies. The existing code is refactored in an attempt to clarify which dependencies are needed and why.
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
|
|
index 8e6e339d1..3936a8cb6 100644
|
|
--- a/gnucash/CMakeLists.txt
|
|
+++ b/gnucash/CMakeLists.txt
|
|
@@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash")
|
|
|
|
set(VALGRIND_OUTDIR ${BINDIR_BUILD})
|
|
|
|
-configure_file(gnucash-valgrind.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind @ONLY)
|
|
-
|
|
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind
|
|
- DESTINATION ${VALGRIND_OUTDIR}
|
|
- FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
|
-)
|
|
-
|
|
## Create the environment file
|
|
|
|
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN)
|
|
@@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT}
|
|
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
|
)
|
|
|
|
-install(FILES ${SCRIPT_LIST} ${VALGRIND_OUTDIR}/gnucash-valgrind DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION
|
|
${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash)
|
|
|
|
@@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes
|
|
|
|
set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
|
|
gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp
|
|
- gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in
|
|
+ gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in
|
|
gnucash-gresources.xml ${gresource_files} price-quotes.scm
|
|
${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST})
|
|
|