gnucash unstable: Rework the Scheme target dependencies.
John Ralls
jralls at code.gnucash.org
Fri Feb 16 17:32:05 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/26e51339 (commit)
from https://github.com/Gnucash/gnucash/commit/772aabf1 (commit)
commit 26e51339a6f8272f23c7b5b8dcc2aa6f7f6ecf84
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 16 14:28:46 2018 -0800
Rework the Scheme target dependencies.
Should fix Bug 793122 - 2.7.3: ninja build fails
along with the nagging parallel-build problems.
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 5f1ae9f..2cf3d7f 100644
--- 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
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index d5fab8c..5293444 100644
--- 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
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index a947439..b6f244c 100644
--- 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}"
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index 910065d..e9ce440 100644
--- 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}"
diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
index 085aab2..914b90a 100644
--- 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}"
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index 291e386..ab2c78c 100644
--- 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}"
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index 01940ba..d36f2a5 100644
--- 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}"
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index d9c8848..f2242c6 100644
--- 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
)
diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
index c9bd6c1..658dfa7 100644
--- 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}"
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 690a755..ff0c5a6 100644
--- 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
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 2bb245b..a6b3ffe 100644
--- 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}"
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index afd54e1..fd2947a 100644
--- 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
diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt
index f06540f..2346421 100644
--- 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}"
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 1c25008..cc15586 100644
--- 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
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index e103b1f..6e77225 100644
--- 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
)
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 6cc96e3..6084f6d 100644
--- 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"
diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt
index abfd4b7..d809679 100644
--- 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}"
diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt
index 35deda7..d87efe8 100644
--- 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
Summary of changes:
gnucash/gnome-utils/CMakeLists.txt | 2 +-
gnucash/gnome-utils/test/CMakeLists.txt | 1 +
gnucash/import-export/qif-imp/CMakeLists.txt | 2 +-
gnucash/report/business-reports/CMakeLists.txt | 9 ++++++++-
gnucash/report/locale-specific/us/CMakeLists.txt | 11 ++++++++++-
gnucash/report/report-gnome/CMakeLists.txt | 12 +++++++++++-
gnucash/report/report-system/CMakeLists.txt | 9 ++++++++-
gnucash/report/report-system/test/CMakeLists.txt | 12 +++++++++++-
gnucash/report/standard-reports/CMakeLists.txt | 11 ++++++++++-
gnucash/report/standard-reports/test/CMakeLists.txt | 14 ++++++++++++--
gnucash/report/stylesheets/CMakeLists.txt | 9 ++++++++-
gnucash/report/stylesheets/test/CMakeLists.txt | 10 +++++-----
gnucash/report/utility-reports/CMakeLists.txt | 9 ++++++++-
libgnucash/app-utils/CMakeLists.txt | 2 +-
libgnucash/app-utils/test/CMakeLists.txt | 9 +++++----
libgnucash/engine/test/CMakeLists.txt | 2 +-
libgnucash/tax/us/CMakeLists.txt | 2 +-
libgnucash/tax/us/test/CMakeLists.txt | 2 +-
18 files changed, 103 insertions(+), 25 deletions(-)
More information about the gnucash-changes
mailing list