Rework the Scheme target dependencies.

Should fix Bug 793122 - 2.7.3: ninja build fails along with the nagging parallel-build problems.
2025-02-25 18:55:30 -06:00 · 2018-02-16 14:28:46 -08:00 · 2018-02-16 14:28:46 -08:00 · 26e51339a6
commit 26e51339a6
parent 772aabf15f
18 changed files with 103 additions and 25 deletions
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@ -248,7 +248,7 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu

 # Scheme

-SET(GUILE_DEPENDS      gncmod-gnome-utils scm-core-utils scm-gnc-module scm-scm)
+SET(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-scm)

 GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
  gnome-utils.scm
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@ -28,6 +28,7 @@ SET(GNOME_UTILS_GUI_TEST_LIBS
 #  GNOME_UTILS_GUI_TEST_LIBS
 #
 SET(GUILE_DEPENDS
+  scm-gnc-module
  test-core
  gncmod-test-engine
  gncmod-app-utils
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@ -54,7 +54,7 @@ SET(qif_import_SCHEME_2
  qif-import.scm
 )

-SET(GUILE_DEPENDS      gncmod-qif-import scm-core-utils scm-gnc-module scm-scm)
+SET(GUILE_DEPENDS      gncmod-qif-import scm-core-utils scm-gnc-module scm-scm scm-app-utils-3)

 GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
  "${qif_import_SCHEME_2}"
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@ -25,7 +25,14 @@ SET(business_reports_DATA
 )

 SET(GUILE_OUTPUT_DIR   gnucash/report)
-SET(GUILE_DEPENDS      scm-business-reports-links scm-standard-reports)
+SET(GUILE_DEPENDS
+  scm-app-utils
+  scm-gettext
+  scm-gnc-module
+  scm-scm
+  scm-business-reports-links
+  scm-standard-reports
+  )

 GNC_ADD_SCHEME_TARGETS(scm-business-reports
  "${business_reports_SCHEME}"
--- a/gnucash/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@ -30,7 +30,16 @@ 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_DEPENDS   gncmod-html scm-tax-us-1 scm-tax-us-2 scm-report-system-3)
+SET(GUILE_DEPENDS
+  scm-core-utils
+  scm-gettext
+  scm-gnc-module
+  scm-scm
+  scm-test-core
+  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}"
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@ -53,7 +53,17 @@ SET(report_gnome_SCHEME
 )

 SET(GUILE_OUTPUT_DIR   gnucash/report)
-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)
+SET(GUILE_DEPENDS
+  gncmod-report-gnome
+  gncmod-engine
+  scm-gettext
+  scm-gnome-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}"
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@ -79,7 +79,14 @@ SET (report_system_SCHEME_3
    report.scm
 )

-SET(GUILE_DEPENDS      gncmod-html gncmod-gnome-utils gncmod-report-system scm-app-utils scm-gnome-utils)
+SET(GUILE_DEPENDS
+  gncmod-html
+  gncmod-gnome-utils
+  gncmod-report-system
+  scm-app-utils
+  scm-scm
+  scm-gnc-module
+  )

 GNC_ADD_SCHEME_TARGETS(scm-report-system
  "${report_system_SCHEME}"
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@ -17,12 +17,22 @@ SET(scm_test_report_system_SOURCES
 # test-test-extras.scm ;;FIXME why is this not run
  )

+set(GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-core-utils
+  scm-gettext
+  scm-engine
+  scm-test-engine
+  scm-scm
+  scm-report-system-3
+  )
 GNC_ADD_SCHEME_TESTS(${scm_test_report_system_SOURCES})

 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"
+  "${GUILE_DEPENDS}"
  FALSE
  )

--- a/gnucash/report/standard-reports/CMakeLists.txt
+++ b/gnucash/report/standard-reports/CMakeLists.txt
@ -33,7 +33,16 @@ SET (standard_reports_SCHEME_2
    trial-balance.scm
    )

-SET(GUILE_DEPENDS      gncmod-html scm-app-utils scm-gnome-utils scm-report-system scm-report-system-3)
+SET(GUILE_DEPENDS
+  gncmod-html
+  scm-core-utils
+  scm-engine
+  scm-gettext
+  scm-scm
+  scm-gnome-utils
+  scm-report-system
+  scm-report-system-3
+  )

 GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1
  "${standard_reports_SCHEME}"
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@ -12,13 +12,23 @@ SET(scm_test_report_SUPPORT
  test-generic-net-linechart.scm
  )

-
+set(GUILE_DEPENDS
+  scm-gnc-module
+  scm-app-utils
+  scm-engine
+  scm-test-engine
+  scm-gettext
+  scm-scm
+  scm-test-report-system
+  scm-standard-reports
+  scm-report-stylesheets-2
+  )
 GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")

 GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
  "${scm_test_report_SUPPORT}"
  "gnucash/report/standard-reports/test"
-  "scm-gnc-module;scm-test-report-system;scm-standard-reports;scm-report-stylesheets-2"
+  "${GUILE_DEPENDS}"
  FALSE
  )
 GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@ -48,7 +48,14 @@ SET(stylesheets_SCHEME_2
 )

 SET(GUILE_OUTPUT_DIR gnucash/report)
-SET(GUILE_DEPENDS gncmod-html scm-app-utils scm-report-system-3)
+SET(GUILE_DEPENDS
+  scm-gnc-module
+  scm-core-utils
+  scm-gettext
+  scm-scm
+  gncmod-html
+  scm-report-system-3
+  )

 GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1
  "${stylesheets_SCHEME_1}"
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@ -1,11 +1,11 @@
 SET(GUILE_DEPENDS
-  test-core
-  gncmod-app-utils
-  gnc-core-utils
-  gnc-module
+  scm-test-core
+  scm-gettext
+  scm-core-utils
+  scm-gnc-module
+  scm-scm
  gncmod-engine
  gncmod-backend-xml
-  gncmod-backend-xml
  gncmod-gnome-utils
  gncmod-html
  gncmod-report-system
--- a/gnucash/report/utility-reports/CMakeLists.txt
+++ b/gnucash/report/utility-reports/CMakeLists.txt
@ -8,7 +8,14 @@ SET(utility_reports_SCHEME
 )

 SET(GUILE_OUTPUT_DIR     gnucash/report)
-SET(GUILE_DEPENDS        scm-utility-reports-links scm-app-utils scm-report-system-3)
+SET(GUILE_DEPENDS
+  scm-app-utils
+  scm-core-utils
+  scm-gettext
+  scm-gnc-module
+  scm-scm
+  scm-utility-reports-links
+  scm-report-system-3)

 GNC_ADD_SCHEME_TARGETS(scm-utility-reports
  "${utility_reports_SCHEME}"
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@ -173,7 +173,7 @@ SET(app_utils_SCHEME_3
    business-prefs.scm
 )

-SET(GUILE_DEPENDS      gncmod-app-utils scm-core-utils scm-engine scm-scm)
+SET(GUILE_DEPENDS      gncmod-app-utils scm-core-utils scm-engine scm-scm scm-gnc-module)

 GNC_ADD_SCHEME_TARGETS(scm-gettext
  gettext.scm
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@ -30,10 +30,11 @@ ADD_APP_UTILS_TEST(test-sx test-sx.cpp)
 SET(GUILE_DEPENDS
  scm-test-engine
  scm-app-utils
-  gnc-core-utils
-  gnc-module
-  gncmod-engine
-  gncmod-backend-xml
+  scm-core-utils
+  scm-gnc-module
+  scm-engine
+  scm-scm
+  scm-gettext
  gncmod-backend-xml
 )

--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@ -218,7 +218,7 @@ SET(engine_test_SCHEME

 #LIST(APPEND engine_test_SCHEME  test-scm-query-import.scm) Fails

-SET(GUILE_DEPENDS      scm-app-utils scm-scm)
+SET(GUILE_DEPENDS      scm-gnc-module scm-app-utils scm-scm)

 GNC_ADD_SCHEME_TARGETS(scm-test-engine-extras
  "test-extras.scm"
--- a/libgnucash/tax/us/CMakeLists.txt
+++ b/libgnucash/tax/us/CMakeLists.txt
@ -26,7 +26,7 @@ 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_DEPENDS      scm-app-utils)
+SET(GUILE_DEPENDS      scm-app-utils scm-gnc-module)

 GNC_ADD_SCHEME_TARGETS(scm-tax-us-1
  "${gncmod_tax_us_SCHEME_1}"
--- a/libgnucash/tax/us/test/CMakeLists.txt
+++ b/libgnucash/tax/us/test/CMakeLists.txt
@ -8,7 +8,7 @@ GNC_ADD_TEST(test-link-module-tax-us test-link-module.c
 # FIXME why is this test not run ?
 #SET(GUILE_DEPENDS
 #  gnc-core-utils
-#  gnc-module
+#  scm-gnc-module
 #)
 #
 #GNC_ADD_SCHEME_TARGETS(scm-test-load-tax-us-module