From f412795ef21d5982758bceea53161a57127a32ab Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 2 Nov 2017 14:46:05 -0700 Subject: [PATCH] Remove extraneous parameters from GNC_ADD_SCHEME_TARGETS --- common/cmake_modules/GncAddSchemeTargets.cmake | 11 +---------- common/test-core/CMakeLists.txt | 6 ------ gnucash/gnome-utils/CMakeLists.txt | 9 --------- gnucash/import-export/qif-imp/CMakeLists.txt | 9 --------- gnucash/report/business-reports/CMakeLists.txt | 11 +---------- gnucash/report/locale-specific/us/CMakeLists.txt | 11 ----------- gnucash/report/report-gnome/CMakeLists.txt | 6 ------ gnucash/report/report-system/CMakeLists.txt | 14 -------------- gnucash/report/report-system/test/CMakeLists.txt | 6 ------ gnucash/report/standard-reports/CMakeLists.txt | 9 --------- .../report/standard-reports/test/CMakeLists.txt | 3 --- gnucash/report/stylesheets/CMakeLists.txt | 9 --------- gnucash/report/utility-reports/CMakeLists.txt | 8 -------- libgnucash/app-utils/CMakeLists.txt | 15 --------------- libgnucash/core-utils/CMakeLists.txt | 6 ------ libgnucash/engine/CMakeLists.txt | 9 --------- libgnucash/engine/test/CMakeLists.txt | 6 ------ libgnucash/gnc-module/CMakeLists.txt | 6 ------ libgnucash/scm/CMakeLists.txt | 13 ++----------- libgnucash/scm/gnumeric/CMakeLists.txt | 10 +--------- libgnucash/tax/us/CMakeLists.txt | 9 --------- 21 files changed, 5 insertions(+), 181 deletions(-) diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake index 2d2478d511..3ad98bc615 100644 --- a/common/cmake_modules/GncAddSchemeTargets.cmake +++ b/common/cmake_modules/GncAddSchemeTargets.cmake @@ -26,17 +26,12 @@ FUNCTION(MAKE_UNIX_PATH_LIST PATH) SET(${PATH} ${newpath} PARENT_SCOPE) ENDFUNCTION() -FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR - _GUILE_MODULES _GUILE_LOAD_DIRS - _GUILE_LIBRARY_DIRS _GUILE_DEPENDS +FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS MAKE_LINKS) SET(__DEBUG FALSE) IF (__DEBUG) MESSAGE("Parameters to COMPILE_SCHEME for target ${_TARGET}") MESSAGE(" SOURCE_FILES: ${_SOURCE_FILES}") - MESSAGE(" GUILE_MODULES: ${_GUILE_MODULES}") - MESSAGE(" GUILE_LOAD_DIRS: ${_GUILE_LOAD_DIRS}") - MESSAGE(" GUILE_LIBRARY_DIRS: ${_GUILE_LIBRARY_DIRS}") MESSAGE(" GUILE_DEPENDS: ${_GUILE_DEPENDS}") MESSAGE(" DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}") ENDIF(__DEBUG) @@ -92,9 +87,6 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR SET(_GUILE_LOAD_PATH "${current_srcdir}" "${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm") # to pick up generated build-config.scm SET(_GUILE_LOAD_COMPILED_PATH "${current_bindir}") - FOREACH (load_item ${_GUILE_LOAD_DIRS}) - LIST(APPEND _GUILE_LOAD_PATH "${CMAKE_SOURCE_DIR}/${load_item}") - ENDFOREACH(load_item) SET(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/2.0) SET(_GUILE_LOAD_PATH "${current_srcdir}") @@ -149,7 +141,6 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR ENDIF(MINGW64) MAKE_UNIX_PATH_LIST(_GUILE_LOAD_PATH) MAKE_UNIX_PATH_LIST(_GUILE_LOAD_COMPILED_PATH) - MAKE_UNIX_PATH_LIST(_GUILE_MODULES) MAKE_UNIX_PATH_LIST(_GUILE_LD_LIBRARY_PATH) MAKE_UNIX_PATH_LIST(_GNC_MODULE_PATH) IF (__DEBUG) diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt index 70ccecee88..9d2e335059 100644 --- a/common/test-core/CMakeLists.txt +++ b/common/test-core/CMakeLists.txt @@ -52,18 +52,12 @@ ENDIF() SET(test_core_SCHEME unittest-support.scm) SET(GUILE_OUTPUT_DIR gnucash) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS "") -SET(GUILE_LIBRARY_DIRS common/test-core libgnucash/engine) SET(GUILE_DEPENDS test-core-guile) GNC_ADD_SCHEME_TARGETS(scm-test-core ${test_core_SCHEME} ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index 4588de8319..084ecb2986 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -246,17 +246,11 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION include/gnucash) # Scheme -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module) SET(GUILE_DEPENDS gncmod-gnome-utils scm-core-utils scm-gnc-module scm-scm) GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1 gnome-utils.scm gnucash - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) @@ -265,9 +259,6 @@ GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1 GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-2 gnc-menu-extensions.scm "" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt index 8334451622..9c7e0e3eee 100644 --- a/gnucash/import-export/qif-imp/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/CMakeLists.txt @@ -54,17 +54,11 @@ SET(qif_import_SCHEME_2 qif-import.scm ) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module gnucash/gnome) SET(GUILE_DEPENDS gncmod-qif-import scm-core-utils scm-gnc-module scm-scm) GNC_ADD_SCHEME_TARGETS(scm-qif-import-2 "${qif_import_SCHEME_2}" "gnucash/import-export" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) @@ -72,9 +66,6 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import-2 GNC_ADD_SCHEME_TARGETS(scm-qif-import "${qif_import_SCHEME}" "qif-import" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt index 224ba51db8..c55e626807 100644 --- a/gnucash/report/business-reports/CMakeLists.txt +++ b/gnucash/report/business-reports/CMakeLists.txt @@ -25,20 +25,11 @@ SET(business_reports_DATA ) SET(GUILE_OUTPUT_DIR gnucash/report) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils - gnucash/report/report-system gnucash/report/standard-reports) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils - libgnucash/scm gnucash/report/business_reports gnucash/report/report-system gnucash/report/standard-reports) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils - gnucash/report/report-system gnucash/report/standard-reports) SET(GUILE_DEPENDS scm-business-reports-links scm-standard-reports) GNC_ADD_SCHEME_TARGETS(scm-business-reports "${business_reports_SCHEME}" - ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" + ${GUILE_OUTPUT_DIR} "${GUILE_DEPENDS}" TRUE ) diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt index 6793bb5da1..97f72119e5 100644 --- a/gnucash/report/locale-specific/us/CMakeLists.txt +++ b/gnucash/report/locale-specific/us/CMakeLists.txt @@ -30,19 +30,11 @@ SET(gncmod_local_reports_us_SCHEME_1 taxtxf.scm taxtxf-de_DE.scm) SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system gnucash/tax/us) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system - libgnucash/scm libgnucash/tax/us) -SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils - gnucash/html gnucash/report/report-system) SET(GUILE_DEPENDS gncmod-html scm-tax-us-1 scm-tax-us-2 scm-report-system-3) GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1 "${gncmod_local_reports_us_SCHEME_1}" gnucash/report - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) @@ -50,9 +42,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1 GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-2 "${gncmod_local_reports_us_SCHEME_2}" gnucash/report/locale-specific - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-report-locale-specific-1;${GUILE_DEPENDS}" FALSE ) diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt index ab4bc9a371..e2362e251f 100644 --- a/gnucash/report/report-gnome/CMakeLists.txt +++ b/gnucash/report/report-gnome/CMakeLists.txt @@ -54,17 +54,11 @@ SET(report_gnome_SCHEME ) SET(GUILE_OUTPUT_DIR gnucash/report) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/scm libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/reports/report-system gnucash/report/utility-reports) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/gnc-module libgnucash/engine libgnucash/scm libgnucash/core-utils gnucash/gnome-utils) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report-gnome) SET(GUILE_DEPENDS gncmod-report-gnome gncmod-engine scm-app-utils scm-gnome-utils scm-core-utils scm-gnc-module scm-scm scm-standard-reports scm-business-reports scm-utility-reports) GNC_ADD_SCHEME_TARGETS(scm-report-gnome "${report_gnome_SCHEME}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt index 6f0bbefe7f..a5892846f6 100644 --- a/gnucash/report/report-system/CMakeLists.txt +++ b/gnucash/report/report-system/CMakeLists.txt @@ -78,19 +78,11 @@ SET (report_system_SCHEME_3 report.scm ) - -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils) SET(GUILE_DEPENDS gncmod-html gncmod-gnome-utils gncmod-report-system scm-app-utils scm-gnome-utils) - GNC_ADD_SCHEME_TARGETS(scm-report-system "${report_system_SCHEME}" "gnucash/report" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) @@ -98,9 +90,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system GNC_ADD_SCHEME_TARGETS(scm-report-system-2 "${report_system_SCHEME_2}" "gnucash/report/report-system" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" scm-report-system FALSE ) @@ -108,9 +97,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system-2 GNC_ADD_SCHEME_TARGETS(scm-report-system-3 "${report_system_SCHEME_3}" "" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" scm-report-system-2 FALSE ) diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt index 897517a46b..fc03bc7d30 100644 --- a/gnucash/report/report-system/test/CMakeLists.txt +++ b/gnucash/report/report-system/test/CMakeLists.txt @@ -22,9 +22,6 @@ GNC_ADD_SCHEME_TEST(test-load-module-report-system test-load-module.in) GNC_ADD_SCHEME_TARGETS(scm-test-report-system "test-extras.scm" gnucash/report/report-system/test - "" - "" - "" "scm-gnc-module;scm-test-engine;scm-report-system-3" FALSE ) @@ -32,9 +29,6 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2 "${scm_test_report_system_SOURCES}" gnucash/report/report-system/test - "" - "" - "" "scm-test-report-system" FALSE ) diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt index 2ff9016e41..fa7be34043 100644 --- a/gnucash/report/standard-reports/CMakeLists.txt +++ b/gnucash/report/standard-reports/CMakeLists.txt @@ -33,17 +33,11 @@ SET (standard_reports_SCHEME_2 trial-balance.scm ) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system) SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-gnome-utils scm-report-system scm-report-system-3) GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1 "${standard_reports_SCHEME}" "gnucash/report" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-standard-reports-2;${GUILE_DEPENDS}" TRUE ) @@ -51,9 +45,6 @@ GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1 GNC_ADD_SCHEME_TARGETS(scm-standard-reports-2 "${standard_reports_SCHEME_2}" "gnucash/report/standard-reports" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-standard-reports-2-links;${GUILE_DEPENDS}" TRUE ) diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt index 6233372683..684020366a 100644 --- a/gnucash/report/standard-reports/test/CMakeLists.txt +++ b/gnucash/report/standard-reports/test/CMakeLists.txt @@ -11,9 +11,6 @@ GNC_ADD_SCHEME_TESTS(${scm_test_standard_reports_SOURCES}) GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports "${scm_test_standard_reports_SOURCES}" gnucash/report/standard-reports/test - "" - "" - "" "scm-gnc-module;scm-test-report-system;scm-standard-reports;scm-report-stylesheets-2" FALSE ) diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt index 0964272373..8ca732542e 100644 --- a/gnucash/report/stylesheets/CMakeLists.txt +++ b/gnucash/report/stylesheets/CMakeLists.txt @@ -48,17 +48,11 @@ SET(stylesheets_SCHEME_2 ) SET(GUILE_OUTPUT_DIR gnucash/report) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/html gnucash/gnome-utils gnucash/report/report-system) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module gnucash/gnome-utils gnucash/report/report-system libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html gnucash/report/report-system) SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-report-system-3) GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1 "${stylesheets_SCHEME_1}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" TRUE ) @@ -66,9 +60,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1 GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-2 "${stylesheets_SCHEME_2}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-report-stylesheets-1;${GUILE_DEPENDS}" TRUE ) diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt index c3221a7c34..64ffc1e558 100644 --- a/gnucash/report/utility-reports/CMakeLists.txt +++ b/gnucash/report/utility-reports/CMakeLists.txt @@ -8,19 +8,11 @@ SET(utility_reports_SCHEME ) SET(GUILE_OUTPUT_DIR gnucash/report) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine gnucash/gnome-utils gnucash/html gnucash/report/report-system) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module - gnucash/gnome-utils gnucash/report/report-system libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/engine libgnucash/app-utils libgnucash/core-utils libgnucash/gnc-module gnucash/gnome-utils gnucash/html - gnucash/report/report-system) SET(GUILE_DEPENDS scm-utility-reports-links scm-app-utils scm-report-system-3) GNC_ADD_SCHEME_TARGETS(scm-utility-reports "${utility_reports_SCHEME}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" TRUE ) diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt index 3b2a312608..db1507c6ee 100644 --- a/libgnucash/app-utils/CMakeLists.txt +++ b/libgnucash/app-utils/CMakeLists.txt @@ -175,17 +175,11 @@ SET(app_utils_SCHEME_3 business-prefs.scm ) -SET(GUILE_MODULES libgnucash/engine) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module) SET(GUILE_DEPENDS gncmod-app-utils scm-core-utils scm-engine scm-scm) GNC_ADD_SCHEME_TARGETS(scm-gettext gettext.scm gnucash - libgnucash/app-utils - "" - "" gncmod-app-utils FALSE ) @@ -193,9 +187,6 @@ GNC_ADD_SCHEME_TARGETS(scm-gettext GNC_ADD_SCHEME_TARGETS(scm-app-utils-1 "${app_utils_SCHEME_1}" "" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-gettext;${GUILE_DEPENDS}" FALSE ) @@ -203,9 +194,6 @@ GNC_ADD_SCHEME_TARGETS(scm-app-utils-1 GNC_ADD_SCHEME_TARGETS(scm-app-utils-2 "${app_utils_SCHEME_2}" "gnucash" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" scm-app-utils-1 FALSE ) @@ -213,9 +201,6 @@ GNC_ADD_SCHEME_TARGETS(scm-app-utils-2 GNC_ADD_SCHEME_TARGETS(scm-app-utils-3 "${app_utils_SCHEME_3}" "" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" scm-app-utils-2 FALSE ) diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt index d667b9e823..dd4ff00d8b 100644 --- a/libgnucash/core-utils/CMakeLists.txt +++ b/libgnucash/core-utils/CMakeLists.txt @@ -198,17 +198,11 @@ ENDIF() SET (core_utils_SCHEME core-utils.scm) SET(GUILE_OUTPUT_DIR gnucash) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/core-utils) -SET(GUILE_LIBRARY_DIRS libgnucash/core-utils) SET(GUILE_DEPENDS gnc-core-utils) GNC_ADD_SCHEME_TARGETS(scm-core-utils "${core_utils_SCHEME}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt index 1b2f62602c..b7f4fb0734 100644 --- a/libgnucash/engine/CMakeLists.txt +++ b/libgnucash/engine/CMakeLists.txt @@ -288,18 +288,12 @@ IF (WITH_SQL) LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi) ENDIF(WITH_SQL) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/gnc-module) -SET(GUILE_LIBRARY_DIRS libgnucash/gnc-module) SET(GUILE_DEPENDS ${BACKEND_DEPENDS} gnc-module gncmod-engine scm-gnc-module) GNC_ADD_SCHEME_TARGETS(scm-engine-0 "${engine_SCHEME_0}" gnucash - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) @@ -307,9 +301,6 @@ GNC_ADD_SCHEME_TARGETS(scm-engine-0 GNC_ADD_SCHEME_TARGETS(scm-engine-1 "${engine_SCHEME_1}" "" - "" - "" - "" "scm-engine-0;${GUILE_DEPENDS}" FALSE ) diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt index bd6bd45828..10a6d62dbd 100644 --- a/libgnucash/engine/test/CMakeLists.txt +++ b/libgnucash/engine/test/CMakeLists.txt @@ -219,17 +219,11 @@ GNC_ADD_SCHEME_TEST(scm-test-split test-split.scm) SET(engine_test_SCHEME test-extras.scm) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/scm) -SET(GUILE_LIBRARY_DIRS "") SET(GUILE_DEPENDS scm-app-utils scm-scm) GNC_ADD_SCHEME_TARGETS(scm-test-engine "${engine_test_SCHEME}" gnucash/engine/test - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/libgnucash/gnc-module/CMakeLists.txt b/libgnucash/gnc-module/CMakeLists.txt index 4e441c9641..250fd5559b 100644 --- a/libgnucash/gnc-module/CMakeLists.txt +++ b/libgnucash/gnc-module/CMakeLists.txt @@ -50,17 +50,11 @@ INSTALL(FILES ${gnc_module_HEADERS} DESTINATION include/gnucash) SET (gnc_module_SCHEME gnc-module.scm) SET(GUILE_OUTPUT_DIR gnucash) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS "") -SET(GUILE_LIBRARY_DIRS "") SET(GUILE_DEPENDS gnc-module) GNC_ADD_SCHEME_TARGETS(scm-gnc-module "${gnc_module_SCHEME}" ${GUILE_OUTPUT_DIR} - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt index 72f0d788f8..4d0aa5b7bf 100644 --- a/libgnucash/scm/CMakeLists.txt +++ b/libgnucash/scm/CMakeLists.txt @@ -22,9 +22,6 @@ ENDIF() # CONFIGURE_FILE(build-config.scm.in ${BUILD_CONFIG_SCM}) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS libgnucash/core-utils libgnucash/gnc-module) -SET(GUILE_LIBRARY_DIRS libgnucash/core-utils libgnucash/gnc-module) SET(GUILE_DEPENDS scm-core-utils scm-gnc-module) SET(scm_SCHEME_0 @@ -35,16 +32,13 @@ SET(scm_SCHEME_0 xml-generator.scm ) -GNC_ADD_SCHEME_TARGETS(scm-scm-0 "${scm_SCHEME_0}" "" "" "" "" "" FALSE) +GNC_ADD_SCHEME_TARGETS(scm-scm-0 "${scm_SCHEME_0}" "" "" FALSE) -GNC_ADD_SCHEME_TARGETS(scm-scm-1 "printf.scm" gnucash "" "" "" "" FALSE) +GNC_ADD_SCHEME_TARGETS(scm-scm-1 "printf.scm" gnucash "" FALSE) GNC_ADD_SCHEME_TARGETS(scm-scm-2 main.scm gnucash - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-scm-1;${GUILE_DEPENDS}" # requires printf.scm from scm-scm-1 and modules from GUILE_DEPENDS FALSE ) @@ -53,9 +47,6 @@ GNC_ADD_SCHEME_TARGETS(scm-scm-2 GNC_ADD_SCHEME_TARGETS(scm-scm-3 price-quotes.scm gnucash - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "scm-scm-2;scm-scm-0" # depends on build_config.scm FALSE) diff --git a/libgnucash/scm/gnumeric/CMakeLists.txt b/libgnucash/scm/gnumeric/CMakeLists.txt index e262e9dac9..549761a051 100644 --- a/libgnucash/scm/gnumeric/CMakeLists.txt +++ b/libgnucash/scm/gnumeric/CMakeLists.txt @@ -3,18 +3,10 @@ SET(gnumeric_SCHEME gnumeric-utilities.scm table-utils.scm) -SET(GUILE_MODULES "") -SET(GUILE_LOAD_DIRS "") -SET(GUILE_LIBRARY_DIRS "") -SET(GUILE_DEPENDS "") - GNC_ADD_SCHEME_TARGETS(scm-gnumeric "${gnumeric_SCHEME}" gnumeric - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" - "${GUILE_DEPENDS}" + "" FALSE ) diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt index c99f1b8ff5..83479bde6c 100644 --- a/libgnucash/tax/us/CMakeLists.txt +++ b/libgnucash/tax/us/CMakeLists.txt @@ -26,26 +26,17 @@ INSTALL(TARGETS gncmod-tax-us SET(gncmod_tax_us_SCHEME_1 txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm) SET(gncmod_tax_us_SCHEME_2 de_DE.scm us.scm) -SET(GUILE_MODULES libgnucash/app-utils libgnucash/engine) -SET(GUILE_LOAD_DIRS libgnucash/app-utils libgnucash/core-utils libgnucash/engine libgnucash/gnc-module libgnucash/scm) -SET(GUILE_LIBRARY_DIRS libgnucash/app-utils libgnucash/engine libgnucash/gnc-module) SET(GUILE_DEPENDS scm-app-utils) GNC_ADD_SCHEME_TARGETS(scm-tax-us-1 "${gncmod_tax_us_SCHEME_1}" "" - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE ) GNC_ADD_SCHEME_TARGETS(scm-tax-us-2 "${gncmod_tax_us_SCHEME_2}" gnucash/tax - "${GUILE_MODULES}" - "${GUILE_LOAD_DIRS}" - "${GUILE_LIBRARY_DIRS}" "${GUILE_DEPENDS}" FALSE )