More Scheme dependency additions.

This commit is contained in:
John Ralls 2018-02-18 15:59:00 -08:00
parent ec0656e7d5
commit a5f46a5e45
19 changed files with 63 additions and 32 deletions

View File

@ -248,7 +248,7 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
# Scheme # Scheme
SET(GUILE_DEPENDS gncmod-gnome-utils scm-gnc-module scm-scm) SET(GUILE_DEPENDS gncmod-gnome-utils scm-gnc-module scm-scm scm-app-utils)
GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1 GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
gnome-utils.scm gnome-utils.scm

View File

@ -29,6 +29,7 @@ SET(GNOME_UTILS_GUI_TEST_LIBS
# #
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
scm-gnc-module scm-gnc-module
scm-gnome-utils
test-core test-core
gncmod-test-engine gncmod-test-engine
gncmod-app-utils gncmod-app-utils

View File

@ -54,7 +54,16 @@ SET(qif_import_SCHEME_2
qif-import.scm qif-import.scm
) )
SET(GUILE_DEPENDS gncmod-qif-import scm-core-utils scm-gnc-module scm-scm scm-app-utils-3) SET(GUILE_DEPENDS
gncmod-qif-import
gnc-gnome
scm-core-utils
scm-gnc-module
scm-scm
scm-app-utils
scm-engine
scm-gnome-utils
)
GNC_ADD_SCHEME_TARGETS(scm-qif-import-2 GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
"${qif_import_SCHEME_2}" "${qif_import_SCHEME_2}"

View File

@ -26,12 +26,15 @@ SET(business_reports_DATA
SET(GUILE_OUTPUT_DIR gnucash/report) SET(GUILE_OUTPUT_DIR gnucash/report)
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
gncmod-html
scm-app-utils scm-app-utils
scm-gettext scm-gettext
scm-gnc-module scm-gnc-module
scm-engine
scm-scm scm-scm
scm-business-reports-links scm-business-reports-links
scm-standard-reports scm-standard-reports
scm-report-system
) )
GNC_ADD_SCHEME_TARGETS(scm-business-reports GNC_ADD_SCHEME_TARGETS(scm-business-reports

View File

@ -31,15 +31,16 @@ SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm)
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
gncmod-html
scm-core-utils scm-core-utils
scm-gettext scm-gettext
scm-gnc-module scm-gnc-module
scm-scm scm-scm
scm-test-core scm-test-core
gncmod-html scm-tax-us
scm-tax-us-1 scm-report-system
scm-tax-us-2 scm-gnome-utils
scm-report-system-3) )
GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1 GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1
"${gncmod_local_reports_us_SCHEME_1}" "${gncmod_local_reports_us_SCHEME_1}"

View File

@ -6,8 +6,9 @@ GNC_ADD_TEST(test-link-module-report-locale-specific-us test-link-module.c
) )
# FIXME why is this not run/running? # FIXME why is this not run/running?
# Answer: Bitrot. The test needs to be rewritten.
#SET(GUILE_DEPENDS #SET(GUILE_DEPENDS
# gncmod-app-utils # scm-app-utils
# gnc-core-utils # gnc-core-utils
# gnc-module # gnc-module
# gncmod-engine # gncmod-engine

View File

@ -55,11 +55,12 @@ SET(report_gnome_SCHEME
SET(GUILE_OUTPUT_DIR gnucash/report) SET(GUILE_OUTPUT_DIR gnucash/report)
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
gncmod-report-gnome gncmod-report-gnome
gncmod-engine scm-engine
scm-gettext scm-gettext
scm-gnome-utils scm-gnome-utils
scm-gnc-module scm-gnc-module
scm-scm scm-scm
scm-report-system
scm-standard-reports scm-standard-reports
scm-business-reports scm-business-reports
scm-utility-reports scm-utility-reports

View File

@ -11,10 +11,10 @@ GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
scm-app-utils scm-app-utils
gncmod-gnome-utils scm-gnome-utils
gnc-module gnc-module
gncmod-engine scm-engine
gncmod-report-gnome scm-report-gnome
) )
GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module

View File

@ -81,14 +81,14 @@ SET (report_system_SCHEME_3
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
gncmod-html gncmod-html
gncmod-gnome-utils scm-gnome-utils
gncmod-report-system gncmod-report-system
scm-app-utils scm-app-utils
scm-scm scm-scm
scm-gnc-module scm-gnc-module
) )
GNC_ADD_SCHEME_TARGETS(scm-report-system GNC_ADD_SCHEME_TARGETS(scm-report-system-1
"${report_system_SCHEME}" "${report_system_SCHEME}"
"gnucash/report" "gnucash/report"
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
@ -98,7 +98,7 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system
GNC_ADD_SCHEME_TARGETS(scm-report-system-2a GNC_ADD_SCHEME_TARGETS(scm-report-system-2a
"${report_system_SCHEME_2a}" "${report_system_SCHEME_2a}"
"gnucash/report/report-system" "gnucash/report/report-system"
scm-report-system scm-report-system-1
FALSE FALSE
) )
@ -116,6 +116,8 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system-3
FALSE FALSE
) )
add_custom_target(scm-report-system ALL DEPENDS scm-report-system-3)
SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt
report-system.i report-system.i
${report_system_HEADERS} ${report_system_SOURCES} ${report_system_HEADERS} ${report_system_SOURCES}

View File

@ -41,7 +41,6 @@ SET(GUILE_DEPENDS
scm-scm scm-scm
scm-gnome-utils scm-gnome-utils
scm-report-system scm-report-system
scm-report-system-3
) )
GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1 GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1

View File

@ -21,7 +21,7 @@ set(GUILE_DEPENDS
scm-scm scm-scm
scm-test-report-system scm-test-report-system
scm-standard-reports scm-standard-reports
scm-report-stylesheets-2 scm-report-stylesheets
) )
GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}") GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")

View File

@ -54,7 +54,7 @@ SET(GUILE_DEPENDS
scm-gettext scm-gettext
scm-scm scm-scm
gncmod-html gncmod-html
scm-report-system-3 scm-report-system
) )
GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1 GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1

View File

@ -4,12 +4,13 @@ SET(GUILE_DEPENDS
scm-core-utils scm-core-utils
scm-gnc-module scm-gnc-module
scm-scm scm-scm
gncmod-engine scm-engine
gncmod-backend-xml gncmod-backend-xml
gncmod-gnome-utils scm-gnome-utils
gncmod-html gncmod-html
gncmod-report-system scm-report-system
gncmod-report-gnome scm-report-gnome
scm-report-stylesheets
) )
GNC_ADD_SCHEME_TARGETS(scm-test-load-report-stylesheets-module GNC_ADD_SCHEME_TARGETS(scm-test-load-report-stylesheets-module

View File

@ -9,13 +9,16 @@ SET(utility_reports_SCHEME
SET(GUILE_OUTPUT_DIR gnucash/report) SET(GUILE_OUTPUT_DIR gnucash/report)
SET(GUILE_DEPENDS SET(GUILE_DEPENDS
gncmod-html
scm-app-utils scm-app-utils
scm-core-utils scm-core-utils
scm-gettext scm-gettext
scm-gnc-module scm-gnc-module
scm-scm scm-scm
scm-utility-reports-links scm-utility-reports-links
scm-report-system-3) scm-gnome-utils
scm-report-system
)
GNC_ADD_SCHEME_TARGETS(scm-utility-reports GNC_ADD_SCHEME_TARGETS(scm-utility-reports
"${utility_reports_SCHEME}" "${utility_reports_SCHEME}"

View File

@ -173,7 +173,13 @@ SET(app_utils_SCHEME_3
business-prefs.scm business-prefs.scm
) )
SET(GUILE_DEPENDS gncmod-app-utils scm-core-utils scm-engine scm-scm scm-gnc-module) SET(GUILE_DEPENDS
gncmod-app-utils
scm-core-utils
scm-engine
scm-scm
scm-gnc-module
)
GNC_ADD_SCHEME_TARGETS(scm-gettext GNC_ADD_SCHEME_TARGETS(scm-gettext
gettext.scm gettext.scm

View File

@ -277,7 +277,10 @@ IF (WITH_SQL)
LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi) LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
ENDIF(WITH_SQL) ENDIF(WITH_SQL)
SET(GUILE_DEPENDS ${BACKEND_DEPENDS} gnc-module gncmod-engine scm-gnc-module) SET(GUILE_DEPENDS
${BACKEND_DEPENDS}
gncmod-engine
scm-gnc-module)
GNC_ADD_SCHEME_TARGETS(scm-engine-0 GNC_ADD_SCHEME_TARGETS(scm-engine-0

View File

@ -218,7 +218,7 @@ SET(engine_test_SCHEME
#LIST(APPEND engine_test_SCHEME test-scm-query-import.scm) Fails #LIST(APPEND engine_test_SCHEME test-scm-query-import.scm) Fails
SET(GUILE_DEPENDS scm-gnc-module scm-app-utils scm-scm) SET(GUILE_DEPENDS scm-gnc-module scm-app-utils scm-scm scm-engine)
GNC_ADD_SCHEME_TARGETS(scm-test-engine-extras GNC_ADD_SCHEME_TARGETS(scm-test-engine-extras
"test-extras.scm" "test-extras.scm"

View File

@ -1,24 +1,23 @@
SET(GUILE_DEPENDS scm-core-utils scm-gnc-module) SET(GUILE_DEPENDS scm-core-utils scm-gnc-module)
SET(scm_scm_1_SCHEME string.scm utilities.scm) SET(scm_SCHEME string.scm utilities.scm)
GNC_ADD_SCHEME_TARGETS(scm-scm-1 GNC_ADD_SCHEME_TARGETS(scm-scm
"${scm_scm_1_SCHEME}" "${scm_SCHEME}"
gnucash gnucash
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
FALSE FALSE
) )
# depends on main.scm # depends on main.scm
GNC_ADD_SCHEME_TARGETS(scm-scm-2 GNC_ADD_SCHEME_TARGETS(price-quotes
price-quotes.scm price-quotes.scm
gnucash gnucash
scm-scm-1 "scm-scm;scm-gnome-utils;scm-app-utils"
FALSE) FALSE)
ADD_CUSTOM_TARGET(scm-scm ALL DEPENDS scm-scm-1 scm-scm-2)
SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt ${scm_scm_1_SCHEME} price-quotes.scm) SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt ${scm_SCHEME} price-quotes.scm)
SET(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE) SET(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)

View File

@ -41,6 +41,8 @@ GNC_ADD_SCHEME_TARGETS(scm-tax-us-2
FALSE FALSE
) )
add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2)
SET_LOCAL_DIST(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}) SET_LOCAL_DIST(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2})
SET(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE) SET(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE)