gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Mar 30 04:03:23 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/e7831314 (commit)
via https://github.com/Gnucash/gnucash/commit/ba15cf7f (commit)
via https://github.com/Gnucash/gnucash/commit/25e08f88 (commit)
via https://github.com/Gnucash/gnucash/commit/06ff8a29 (commit)
via https://github.com/Gnucash/gnucash/commit/c05281c5 (commit)
via https://github.com/Gnucash/gnucash/commit/91ecdcb5 (commit)
via https://github.com/Gnucash/gnucash/commit/ba7362d8 (commit)
from https://github.com/Gnucash/gnucash/commit/f74d7c52 (commit)
commit e78313147c1f53727050d06ccdabf97966992205
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Mar 19 06:31:51 2020 +0100
Cmake - rework gnc_add_scheme_deprecated_module to use keyword parameters
Update all invocations accordingly
diff --git a/bindings/guile/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt
index 513d81ab6..5ab1c6863 100644
--- a/bindings/guile/test/CMakeLists.txt
+++ b/bindings/guile/test/CMakeLists.txt
@@ -43,7 +43,10 @@ gnc_add_scheme_test_targets(scm-test-engine-extras
DEPENDS "${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash engine test test-extras" "tests test-engine-extras" "scm-test-engine-extras" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash engine test test-extras"
+ NEW_MODULE "tests test-engine-extras"
+ DEPENDS "scm-test-engine-extras")
gnc_add_scheme_test_targets(scm-test-engine
SOURCES "${bindings_test_SCHEME}"
@@ -61,7 +64,10 @@ if (HAVE_SRFI64)
DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras")
# Module interfaces deprecated in 4.x, will be removed for 5.x
- gnc_add_scheme_deprecated_module ("gnucash engine test srfi64-extras" "tests srfi64-extras" "scm-srfi64-extras" "")
+ gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash engine test srfi64-extras"
+ NEW_MODULE "tests srfi64-extras"
+ DEPENDS "scm-srfi64-extras")
set (scm_tests_with_srfi64_SOURCES
test-business-core.scm
@@ -121,5 +127,8 @@ set(test_guile_DIST
)
# Define two imaginary deprecated guile modules to test the compat file generation code
-gnc_add_scheme_deprecated_module ("gnucash deprecated-module" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash superseded-module" "gnucash utilities" "scm-engine" "")
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash deprecated-module")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash superseded-module"
+ NEW_MODULE "gnucash utilities"
+ DEPENDS "scm-engine")
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 356eebfa6..6a4c25752 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -304,29 +304,45 @@ function(gnc_add_scheme_test_targets _TARGET)
gnc_add_scheme_targets(${_TARGET} ${ARGN} TEST)
endfunction()
+# gnc_add_scheme_deprecated_module (OLD_MODULE old_module_name
+# [NEW_MODULE new_module_name
+# DEPENDS new_module_target]
+# [MESSAGE msg_string])
+#
# Function to write boilerplate code for deprecated guile modules
-# All but the _OLDMOD parameter are optional
-# It will emit a deprecation warning and if _NEWMOD is also given
-# that module will be loaded instead.
-# If _NEWMOD is given, _DEPENDS should be set to the target for which
+# such that invocation of the old module will emit a deprecation warning
+# message.
+#
+# All but the OLD_MODULE keyword are optional
+#
+# OLD_MODULE and NEW_MODULE should be passed in the form
+# "gnucash mod parts"
+#
+# If NEW_MODULE is set that module will be loaded instead of the
+# deprecated module.
+# If NEW_MODULE is set, DEPENDS should be set to the target for which
# that module is a source file.
# For example module (gnucash reports standard transaction)
# is defined in transaction.scm, which is a source file for
-# cmake target scm-reports-standard so that should be set as _DEPENDS.
-
-# The function expects module names in the form "gnucash mod parts"
-# If _DEPMSG is left blank, the module will emit a generic message,
-# otherswise _DEPMSG will be emitted.
-function(gnc_add_scheme_deprecated_module _OLDMOD _NEWMOD _DEPENDS _DEPMSG)
- string(STRIP _OLDMOD "${_OLDMOD}")
- string(REPLACE " " "-" _TARGET ${_OLDMOD})
+# cmake target scm-reports-standard so that should be set as DEPENDS.
+#
+# If MESSAGE is left blank, the module will emit a generic message.
+# Otherwise MESSAGE will be emitted.
+function(gnc_add_scheme_deprecated_module)
+
+ set(singleValues OLD_MODULE NEW_MODULE MESSAGE)
+ set(multiValues DEPENDS)
+ cmake_parse_arguments(DM "" "${singleValues}" "${multiValues}" ${ARGN})
+
+ string(STRIP DM_OLD_MODULE "${DM_OLD_MODULE}")
+ string(REPLACE " " "-" _TARGET ${DM_OLD_MODULE})
set(_TARGET "scm-deprecated-${_TARGET}")
- string(REPLACE " " ";" MODPARTS "${_OLDMOD}")
+ string(REPLACE " " ";" MODPARTS "${DM_OLD_MODULE}")
list(GET MODPARTS -1 DEPFILENAME)
set(SOURCEFILE "${CMAKE_CURRENT_BINARY_DIR}/deprecated/${DEPFILENAME}.scm")
- string(FIND "${_OLDMOD}" ${DEPFILENAME} POS REVERSE)
+ string(FIND "${DM_OLD_MODULE}" ${DEPFILENAME} POS REVERSE)
if (${POS} LESS 2)
set(MODPATH "gnucash/deprecated")
else()
@@ -336,38 +352,38 @@ function(gnc_add_scheme_deprecated_module _OLDMOD _NEWMOD _DEPENDS _DEPMSG)
endif()
set(DEPPREFIX "* WARN <gnc-guile-deprecation> *: ")
- if (_DEPMSG)
- set(DEPWARNING "(issue-deprecation-warning \"${DEPPREFIX}${_DEPMSG}\")")
+ if (DM_MESSAGE)
+ set(DEPWARNING "(issue-deprecation-warning \"${DEPPREFIX}${DM_MESSAGE}\")")
else()
set(DEPWARNING
- "(issue-deprecation-warning \"${DEPPREFIX}Module '(${_OLDMOD})' has been deprecated and will be removed in the future.\")")
- if (_NEWMOD)
+ "(issue-deprecation-warning \"${DEPPREFIX}Module '(${DM_OLD_MODULE})' has been deprecated and will be removed in the future.\")")
+ if (DM_NEW_MODULE)
set(DEPWARNING "${DEPWARNING}
- (issue-deprecation-warning \"${DEPPREFIX}Use module '(${_NEWMOD})' instead.\")")
+ (issue-deprecation-warning \"${DEPPREFIX}Use module '(${DM_NEW_MODULE})' instead.\")")
endif()
endif()
# Write the stub file
file(WRITE ${SOURCEFILE} "
;; ${DEPFILENAME}.scm
-;; Compatibility module for deprecated (${_OLDMOD}).
+;; Compatibility module for deprecated (${DM_OLD_MODULE}).
;; This file is autogenerated, do not modify by hand.
-(define-module (${_OLDMOD}))
+(define-module (${DM_OLD_MODULE}))
${DEPWARNING}
")
- if (_NEWMOD)
+ if (DM_NEW_MODULE)
file(APPEND ${SOURCEFILE} "
-(use-modules (${_NEWMOD}))
+(use-modules (${DM_NEW_MODULE}))
(let ((i (module-public-interface (current-module))))
- (module-use! i (resolve-interface '(${_NEWMOD}))))")
+ (module-use! i (resolve-interface '(${DM_NEW_MODULE}))))")
endif()
gnc_add_scheme_targets("${_TARGET}"
SOURCES "${SOURCEFILE}"
OUTPUT_DIR "${MODPATH}"
- DEPENDS "${_DEPENDS}")
+ DEPENDS "${DM_DEPENDS}")
endfunction()
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index 23f60addf..0406e9304 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -67,7 +67,10 @@ gnc_add_scheme_test_targets(scm-test-core
add_dependencies(check scm-test-core)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash unittest-support" "tests unittest-support" "scm-test-core" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash unittest-support"
+ NEW_MODULE "tests unittest-support"
+ DEPENDS "scm-test-core")
if (GTEST_SRC_DIR)
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 00ded550d..152383741 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -257,7 +257,10 @@ gnc_add_scheme_targets(scm-gnome
DEPENDS "${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash report report-gnome" "gnucash report-menus" "scm-gnome" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report report-gnome"
+ NEW_MODULE"gnucash report-menus"
+ DEPENDS "scm-gnome")
set_dist_list(gnome_DIST
CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 4d9c73f3f..99723b24f 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -88,8 +88,14 @@ gnc_add_scheme_targets(scm-qif-import
MAKE_LINKS)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash import-export qif-import" "gnucash qif-import" "scm-qif-import-2" "")
-gnc_add_scheme_deprecated_module ("gnucash import-export string" "gnucash string" "scm-qif-import-0" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash import-export qif-import"
+ NEW_MODULE "gnucash qif-import"
+ DEPENDS "scm-qif-import-2")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash import-export string"
+ NEW_MODULE "gnucash string"
+ DEPENDS "scm-qif-import-0")
set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index e4489c0ee..1a18276e5 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -119,16 +119,28 @@ gnc_add_scheme_targets(scm-report-eguile
DEPENDS scm-report-eguile-parts)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash report eguile-gnc" "gnucash eguile" "scm-report-eguile" "")
-gnc_add_scheme_deprecated_module ("gnucash report eguile-html-utilities" "gnucash eguile" "scm-report-eguile" "")
-gnc_add_scheme_deprecated_module ("gnucash report eguile-utilities" "gnucash eguile" "scm-report-eguile" "")
-gnc_add_scheme_deprecated_module ("gnucash report report-system" "gnucash report" "scm-report-2" "")
-
-gnc_add_scheme_deprecated_module ("gnucash report business-reports" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash report report-system collectors" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash report report-system report-collectors" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash report stylesheets" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash report utility-reports" "" "" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report eguile-gnc"
+ NEW_MODULE "gnucash eguile"
+ DEPENDS "scm-report-eguile")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report eguile-html-utilities"
+ NEW_MODULE "gnucash eguile"
+ DEPENDS "scm-report-eguile")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report eguile-utilities"
+ NEW_MODULE "gnucash eguile"
+ DEPENDS "scm-report-eguile")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report report-system"
+ NEW_MODULE "gnucash report"
+ DEPENDS "scm-report-2")
+
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report business-reports")
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report report-system collectors")
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report report-system report-collectors")
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report stylesheets")
+gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report utility-reports")
add_custom_target(scm-report ALL DEPENDS scm-report-2 scm-report-eguile)
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 7efb7367e..22b1fcc26 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -171,54 +171,198 @@ add_custom_target(scm-reports ALL DEPENDS
scm-reports-de_DE)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports" "gnucash reports" "scm-rpt-reports" "")
-gnc_add_scheme_deprecated_module ("gnucash report aging" "gnucash reports aging" "scm-reports-common" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports average-balance" "gnucash reports example average-balance" "scm-reports-example" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports daily-reports" "gnucash reports example daily-reports" "scm-reports-example" "")
-gnc_add_scheme_deprecated_module ("gnucash report hello-world" "gnucash reports example hello-world" "scm-reports-example" "")
-gnc_add_scheme_deprecated_module ("gnucash report test-graphing" "gnucash reports example sample-graphs" "scm-reports-example" "")
-gnc_add_scheme_deprecated_module ("gnucash report locale-specific de_DE" "gnucash reports locale-specific de_DE taxtxf" "scm-reports-de_DE" "")
-gnc_add_scheme_deprecated_module ("gnucash report taxtxf-de_DE" "gnucash reports locale-specific de_DE taxtxf" "scm-reports-de_DE" "")
-gnc_add_scheme_deprecated_module ("gnucash report locale-specific us" "gnucash reports locale-specific us taxtxf" "scm-reports-us" "")
-gnc_add_scheme_deprecated_module ("gnucash report taxtxf" "gnucash reports locale-specific us taxtxf" "scm-reports-us" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports account-piecharts" "gnucash reports standard account-piecharts" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports account-summary" "gnucash reports standard account-summary" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports advanced-portfolio" "gnucash reports standard advanced-portfolio" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports balance-forecast" "gnucash reports standard balance-forecast" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports balance-sheet" "gnucash reports standard balance-sheet" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report balsheet-eg" "gnucash reports standard balsheet-eg" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports balsheet-pnl" "gnucash reports standard balsheet-pnl" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-balance-sheet" "gnucash reports standard budget-balance-sheet" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-barchart" "gnucash reports standard budget-barchart" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-flow" "gnucash reports standard budget-flow" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget" "gnucash reports standard budget" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-income-statement" "gnucash reports standard budget-income-statement" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports cashflow-barchart" "gnucash reports standard cashflow-barchart" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports cash-flow" "gnucash reports standard cash-flow" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports category-barchart" "gnucash reports standard category-barchart" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report customer-summary" "gnucash reports standard customer-summary" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report welcome-to-gnucash" "gnucash reports standard dashboard" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports equity-statement" "gnucash reports standard equity-statement" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports general-journal" "gnucash reports standard general-journal" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports general-ledger" "gnucash reports standard general-ledger" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports income-gst-statement" "gnucash reports standard income-gst-statement" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports income-statement" "gnucash reports standard income-statement" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report invoice" "gnucash reports standard invoice" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report job-report" "gnucash reports standard job-report" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports net-charts" "gnucash reports standard net-charts" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report owner-report" "gnucash reports standard owner-report" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report payables" "gnucash reports standard payables" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports portfolio" "gnucash reports standard portfolio" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports price-scatter" "gnucash reports standard price-scatter" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report receipt" "gnucash reports standard receipt" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report receivables" "gnucash reports standard receivables" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports reconcile-report" "gnucash reports standard reconcile-report" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports register" "gnucash reports standard register" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports sx-summary" "gnucash reports standard account-summary" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report taxinvoice" "gnucash reports standard taxinvoice" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports transaction" "gnucash reports standard transaction" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report standard-reports trial-balance" "gnucash reports standard trial-balance" "scm-reports-standard" "")
-gnc_add_scheme_deprecated_module ("gnucash report view-column" "gnucash reports standard view-column" "scm-reports-standard" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports"
+ NEW_MODULE "gnucash reports"
+ DEPENDS "scm-rpt-reports")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report aging"
+ NEW_MODULE "gnucash reports aging"
+ DEPENDS "scm-reports-common")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports average-balance"
+ NEW_MODULE "gnucash reports example average-balance"
+ DEPENDS "scm-reports-example")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports daily-reports"
+ NEW_MODULE "gnucash reports example daily-reports"
+ DEPENDS "scm-reports-example")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report hello-world"
+ NEW_MODULE "gnucash reports example hello-world"
+ DEPENDS "scm-reports-example")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report test-graphing"
+ NEW_MODULE "gnucash reports example sample-graphs"
+ DEPENDS "scm-reports-example")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report locale-specific de_DE"
+ NEW_MODULE "gnucash reports locale-specific de_DE taxtxf"
+ DEPENDS "scm-reports-de_DE")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report taxtxf-de_DE"
+ NEW_MODULE "gnucash reports locale-specific de_DE taxtxf"
+ DEPENDS "scm-reports-de_DE")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report locale-specific us"
+ NEW_MODULE "gnucash reports locale-specific us taxtxf"
+ DEPENDS "scm-reports-us")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report taxtxf"
+ NEW_MODULE "gnucash reports locale-specific us taxtxf"
+ DEPENDS "scm-reports-us")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports account-piecharts"
+ NEW_MODULE "gnucash reports standard account-piecharts"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports account-summary"
+ NEW_MODULE "gnucash reports standard account-summary"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports advanced-portfolio"
+ NEW_MODULE "gnucash reports standard advanced-portfolio"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports balance-forecast"
+ NEW_MODULE "gnucash reports standard balance-forecast"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports balance-sheet"
+ NEW_MODULE "gnucash reports standard balance-sheet"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report balsheet-eg"
+ NEW_MODULE "gnucash reports standard balsheet-eg"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports balsheet-pnl"
+ NEW_MODULE "gnucash reports standard balsheet-pnl"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports budget-balance-sheet"
+ NEW_MODULE "gnucash reports standard budget-balance-sheet"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports budget-barchart"
+ NEW_MODULE "gnucash reports standard budget-barchart"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports budget-flow"
+ NEW_MODULE "gnucash reports standard budget-flow"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports budget"
+ NEW_MODULE "gnucash reports standard budget"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports budget-income-statement"
+ NEW_MODULE "gnucash reports standard budget-income-statement"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports cashflow-barchart"
+ NEW_MODULE "gnucash reports standard cashflow-barchart"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports cash-flow"
+ NEW_MODULE "gnucash reports standard cash-flow"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports category-barchart"
+ NEW_MODULE "gnucash reports standard category-barchart"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report customer-summary"
+ NEW_MODULE "gnucash reports standard customer-summary"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report welcome-to-gnucash"
+ NEW_MODULE "gnucash reports standard dashboard"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports equity-statement"
+ NEW_MODULE "gnucash reports standard equity-statement"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports general-journal"
+ NEW_MODULE "gnucash reports standard general-journal"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports general-ledger"
+ NEW_MODULE "gnucash reports standard general-ledger"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports income-gst-statement"
+ NEW_MODULE "gnucash reports standard income-gst-statement"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports income-statement"
+ NEW_MODULE "gnucash reports standard income-statement"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report invoice"
+ NEW_MODULE "gnucash reports standard invoice"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report job-report"
+ NEW_MODULE "gnucash reports standard job-report"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports net-charts"
+ NEW_MODULE "gnucash reports standard net-charts"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report owner-report"
+ NEW_MODULE "gnucash reports standard owner-report"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report payables"
+ NEW_MODULE "gnucash reports standard payables"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports portfolio"
+ NEW_MODULE "gnucash reports standard portfolio"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports price-scatter"
+ NEW_MODULE "gnucash reports standard price-scatter"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report receipt"
+ NEW_MODULE "gnucash reports standard receipt"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report receivables"
+ NEW_MODULE "gnucash reports standard receivables"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports reconcile-report"
+ NEW_MODULE "gnucash reports standard reconcile-report"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports register"
+ NEW_MODULE "gnucash reports standard register"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports sx-summary"
+ NEW_MODULE "gnucash reports standard account-summary"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report taxinvoice"
+ NEW_MODULE "gnucash reports standard taxinvoice"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports transaction"
+ NEW_MODULE "gnucash reports standard transaction"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report standard-reports trial-balance"
+ NEW_MODULE "gnucash reports standard trial-balance"
+ DEPENDS "scm-reports-standard")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report view-column"
+ NEW_MODULE "gnucash reports standard view-column"
+ DEPENDS "scm-reports-standard")
set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME}
${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_standard_SCHEME_2}
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index f0a7817d7..991a12d7a 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -22,11 +22,26 @@ gnc_add_scheme_targets(scm-report-stylesheets-1
MAKE_LINKS)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash report stylesheet-easy" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "")
-gnc_add_scheme_deprecated_module ("gnucash report stylesheet-fancy" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "")
-gnc_add_scheme_deprecated_module ("gnucash report stylesheet-footer" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "")
-gnc_add_scheme_deprecated_module ("gnucash report stylesheet-head-or-tail" "gnucash report stylesheets head-or-tail" "scm-report-stylesheets-1" "")
-gnc_add_scheme_deprecated_module ("gnucash report stylesheet-plain" "gnucash report stylesheets plain" "scm-report-stylesheets-1" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report stylesheet-easy"
+ NEW_MODULE "gnucash report stylesheets footer"
+ DEPENDS "scm-report-stylesheets-1")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report stylesheet-fancy"
+ NEW_MODULE "gnucash report stylesheets footer"
+ DEPENDS "scm-report-stylesheets-1")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report stylesheet-footer"
+ NEW_MODULE "gnucash report stylesheets footer"
+ DEPENDS "scm-report-stylesheets-1")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report stylesheet-head-or-tail"
+ NEW_MODULE "gnucash report stylesheets head-or-tail"
+ DEPENDS "scm-report-stylesheets-1")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash report stylesheet-plain"
+ NEW_MODULE "gnucash report stylesheets plain"
+ DEPENDS "scm-report-stylesheets-1")
add_custom_target(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1)
diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt
index 2ac920ad3..33a5dfc34 100644
--- a/gnucash/report/test/CMakeLists.txt
+++ b/gnucash/report/test/CMakeLists.txt
@@ -66,4 +66,7 @@ set_dist_list(test_report_DIST
)
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("tests test-report-system-extras" "tests test-report-extras" "scm-test-report" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "tests test-report-system-extras"
+ NEW_MODULE "tests test-report-extras"
+ DEPENDS "scm-test-report")
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 105d7ed91..225c14de7 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -186,9 +186,12 @@ gnc_add_scheme_targets(scm-app-utils-2
DEPENDS "scm-app-utils-1")
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("migrate-prefs" "" "" "")
-gnc_add_scheme_deprecated_module ("migrate-prefs-user" "" "" "")
-gnc_add_scheme_deprecated_module ("gnucash gettext" "gnucash core-utils" "scm-core-utils" "")
+gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs")
+gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs-user")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash gettext"
+ NEW_MODULE "gnucash core-utils"
+ DEPENDS "scm-core-utils")
add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
index fc9dff10e..1afdc6349 100644
--- a/libgnucash/tax/CMakeLists.txt
+++ b/libgnucash/tax/CMakeLists.txt
@@ -55,8 +55,14 @@ gnc_add_scheme_targets(scm-tax-de_DE-2
DEPENDS "scm-tax-de_DE-1;${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash locale de_DE tax" "scm-tax-de_DE-2" "")
-gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash locale us tax" "scm-tax-us-2" "")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash tax de_DE"
+ NEW_MODULE "gnucash locale de_DE tax"
+ DEPENDS "scm-tax-de_DE-2")
+gnc_add_scheme_deprecated_module (
+ OLD_MODULE "gnucash tax us"
+ NEW_MODULE "gnucash locale us tax"
+ DEPENDS "scm-tax-us-2")
add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
commit ba15cf7f7f94f66cbfd14e84c00c014f78ce4216
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 15 10:35:33 2020 +0100
Combine the two scheme target generation functions
Add another keyword TEST to set when test targets are to be created
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index edc72841e..356eebfa6 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -104,9 +104,43 @@ macro(find_guile_dirs)
"{GNC_HOME}/${GUILE_REL_UNIX_SITECCACHEDIR}")
endmacro(find_guile_dirs)
-# Internal function called by gnc_add_scheme_targets and gnc_add_schemte_test_targets
-function(_make_scheme_targets _TARGET)
- set(noValues MAKE_LINKS)
+# gnc_add_scheme_targets (target
+# SOURCES source1 source2 ...
+# OUTPUT_DIR directory
+# [DEPENDS depedency1 dependency2 ...]
+# [MAKE_LINKS] [TEST])
+#
+#̉ Use this function to add scheme targets, that is *.scm files to
+# compile into their corresponding *.go files.
+#
+# SOURCES is a list of scm source files to compile.
+#
+# The resulting *.go binaries will be generated in OUTPUT_DIR directory.
+# This directory is interpreted as a path relative to the build's guile compiled directory
+# directory. For example if guile binaries in the build directory are located in
+# $HOME/gnucash/build/lib/x86_64-linux-gnu/guile/2.0/site-cache and OUTPUT_DIR is "gnucash"
+# the binary .go files will go into
+# $HOME/gnucash/build/lib/x86_64-linux-gnu/guile/2.0/site-cache/gnucash
+#
+# If cmake targets are provided via the DEPENDS keyword those will be added to
+# the guile targets as dependencies.
+#
+# If MAKE_LINKS is set links (or copies on Windows) will be set up
+# from the source directory to the build's guile sources directory.
+# For example if guile source path in the build directory is
+# $HOME/gnucash/build/share/guile/site/2.0 and OUTPUT_DIR is "gnucash"
+# the links or copies will go into
+# $HOME/gnucash/build/share/guile/site/2.0/gnucash
+#
+# If keyword TEST is specified this target will be treated as a test target.
+# That is its compiled files won't be installed and will be added to the set
+# of tests to run via the "check" target. If TEST is not set the targets are
+# considerd normal targets and will be added to the list of files to install.
+# They will be installed in the guile compied directory relative to the prefix
+# set up for this build, with the OUTPUT_DIR appended to it. For example:
+# /usr/local/lib/x86_64-linux-gnu/guile/2.0/site-cache/gnucash
+function(gnc_add_scheme_targets _TARGET)
+ set(noValues MAKE_LINKS TEST)
set(singleValues OUTPUT_DIR)
set(multiValues SOURCES DEPENDS)
cmake_parse_arguments(SCHEME_TGT "${noValues}" "${singleValues}" "${multiValues}" ${ARGN})
@@ -117,6 +151,7 @@ function(_make_scheme_targets _TARGET)
message(" SOURCE_FILES: ${SCHEME_TGT_SOURCES}")
message(" GUILE_DEPENDS: ${SCHEME_TGT_DEPENDS}")
message(" MAKE_LINKS: ${SCHEME_TGT_MAKE_LINKS}")
+ message(" TEST: ${SCHEME_TGT_TEST}")
message(" DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}, ${SCHEME_TGT_OUTPUT_DIR}")
endif()
set(_CMD "create_symlink")
@@ -247,52 +282,26 @@ function(_make_scheme_targets _TARGET)
add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
- set(_SOURCE_FILES "${SCHEME_TGT_SOURCES}" PARENT_SCOPE)
- set(_OUTPUT_DIR "${SCHEME_TGT_OUTPUT_DIR}" PARENT_SCOPE)
-endfunction()
-
-# gnc_add_scheme_targets (target
-# SOURCES source1 source2 ...
-# OUTPUT_DIR directory
-# [DEPENDS depedency1 dependency2 ...]
-# [MAKE_LINKS])
-#
-#̉ Use this function to add scheme targets, that is *.scm files to
-# compile into their corresponding *.go files.
-# SOURCES is a list of scm source files to compile
-# The resulting *.go binaries will be installed in OUTPUT_DIR directory.
-# This directory is interpreted as a path relative to the system's or build's guile compiled directory
-# directory. For example if guile binaries are installed in
-# /usr/local/lib/x86_64-linux-gnu/guile/2.0/site-cache and OUTPUT_DIR is "gnucash"
-# the binary .go files will go into
-# /usr/local/lib/x86_64-linux-gnu/guile/2.0/site-cache/gnucash
-# If cmake targets are provided via the DEPENDS keyword those will be added to
-# the guile targets as dependencies.
-# Finally if MAKE_LINKS is set links (or copies on Windows) will be set up
-# from the source directory to the build's guile sources directory.
-# For example if guile source path in the build directory is
-# $HOME/gnucash/build/share/guile/site/2.0 and OUTPUT_DIR is "gnucash"
-# the links or copies will go into
-# $HOME/gnucash/build/share/guile/site/2.0/gnucash
-function(gnc_add_scheme_targets)
- _make_scheme_targets(${ARGN})
- install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${_OUTPUT_DIR})
- install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
+ if(TEST)
+ add_dependencies(check ${_TARGET})
+ else()
+ install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${SCHEME_TGT_OUTPUT_DIR})
+ install(FILES ${SCHEME_TGT_SOURCES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
+ endif()
endfunction()
+
# gnc_add_scheme_test_targets (target
# SOURCES source1 source2 ...
# OUTPUT_DIR directory
# [DEPENDS depedency1 dependency2 ...]
# [MAKE_LINKS])
#
-# Exactly like gnc_add_scheme_targets except
-# - these targets will never be installed
-# - they will be marked to be run as tests
+# Calls gnc_add_scheme_targets with the TEST keyword set
+# See that function's description for more details.
function(gnc_add_scheme_test_targets _TARGET)
- _make_scheme_targets(${_TARGET} ${ARGN})
- add_dependencies(check ${_TARGET})
+ gnc_add_scheme_targets(${_TARGET} ${ARGN} TEST)
endfunction()
# Function to write boilerplate code for deprecated guile modules
commit 25e08f88a5fa37d2310b2f0574a3949c4c08497d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 15 09:38:41 2020 +0100
Document the two primary functions for adding scheme targets
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index cc950befa..edc72841e 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -104,7 +104,8 @@ macro(find_guile_dirs)
"{GNC_HOME}/${GUILE_REL_UNIX_SITECCACHEDIR}")
endmacro(find_guile_dirs)
-function(make_scheme_targets _TARGET)
+# Internal function called by gnc_add_scheme_targets and gnc_add_schemte_test_targets
+function(_make_scheme_targets _TARGET)
set(noValues MAKE_LINKS)
set(singleValues OUTPUT_DIR)
set(multiValues SOURCES DEPENDS)
@@ -250,14 +251,47 @@ function(make_scheme_targets _TARGET)
set(_OUTPUT_DIR "${SCHEME_TGT_OUTPUT_DIR}" PARENT_SCOPE)
endfunction()
+
+# gnc_add_scheme_targets (target
+# SOURCES source1 source2 ...
+# OUTPUT_DIR directory
+# [DEPENDS depedency1 dependency2 ...]
+# [MAKE_LINKS])
+#
+#̉ Use this function to add scheme targets, that is *.scm files to
+# compile into their corresponding *.go files.
+# SOURCES is a list of scm source files to compile
+# The resulting *.go binaries will be installed in OUTPUT_DIR directory.
+# This directory is interpreted as a path relative to the system's or build's guile compiled directory
+# directory. For example if guile binaries are installed in
+# /usr/local/lib/x86_64-linux-gnu/guile/2.0/site-cache and OUTPUT_DIR is "gnucash"
+# the binary .go files will go into
+# /usr/local/lib/x86_64-linux-gnu/guile/2.0/site-cache/gnucash
+# If cmake targets are provided via the DEPENDS keyword those will be added to
+# the guile targets as dependencies.
+# Finally if MAKE_LINKS is set links (or copies on Windows) will be set up
+# from the source directory to the build's guile sources directory.
+# For example if guile source path in the build directory is
+# $HOME/gnucash/build/share/guile/site/2.0 and OUTPUT_DIR is "gnucash"
+# the links or copies will go into
+# $HOME/gnucash/build/share/guile/site/2.0/gnucash
function(gnc_add_scheme_targets)
- make_scheme_targets(${ARGN})
+ _make_scheme_targets(${ARGN})
install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${_OUTPUT_DIR})
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
endfunction()
+# gnc_add_scheme_test_targets (target
+# SOURCES source1 source2 ...
+# OUTPUT_DIR directory
+# [DEPENDS depedency1 dependency2 ...]
+# [MAKE_LINKS])
+#
+# Exactly like gnc_add_scheme_targets except
+# - these targets will never be installed
+# - they will be marked to be run as tests
function(gnc_add_scheme_test_targets _TARGET)
- make_scheme_targets(${_TARGET} ${ARGN})
+ _make_scheme_targets(${_TARGET} ${ARGN})
add_dependencies(check ${_TARGET})
endfunction()
commit 06ff8a292d8f258f0f706fa6f09c7297e057de31
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Mar 14 10:30:35 2020 +0100
Use new keyword parameters for all calls to gnc_add_scheme_test_targets
diff --git a/bindings/guile/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt
index 45e77bfbd..513d81ab6 100644
--- a/bindings/guile/test/CMakeLists.txt
+++ b/bindings/guile/test/CMakeLists.txt
@@ -38,21 +38,17 @@ set(GUILE_DEPENDS
scm-engine)
gnc_add_scheme_test_targets(scm-test-engine-extras
- "test-engine-extras.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "test-engine-extras.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash engine test test-extras" "tests test-engine-extras" "scm-test-engine-extras" "")
gnc_add_scheme_test_targets(scm-test-engine
- "${bindings_test_SCHEME}"
- "tests"
- "${GUILE_DEPENDS};scm-test-engine-extras"
- FALSE
-)
+ SOURCES "${bindings_test_SCHEME}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras")
add_dependencies(check scm-test-engine)
@@ -60,11 +56,9 @@ gnc_add_scheme_tests("${engine_test_SCHEME}")
if (HAVE_SRFI64)
gnc_add_scheme_test_targets (scm-srfi64-extras
- "srfi64-extras.scm"
- "tests"
- "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
- FALSE
- )
+ SOURCES "srfi64-extras.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash engine test srfi64-extras" "tests srfi64-extras" "scm-srfi64-extras" "")
@@ -74,11 +68,9 @@ if (HAVE_SRFI64)
)
gnc_add_scheme_test_targets (scm-test-with-srfi64
- "${scm_tests_with_srfi64_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras;gnc-engine"
- FALSE
- )
+ SOURCES "${scm_tests_with_srfi64_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras;gnc-engine")
gnc_add_scheme_tests("${scm_tests_with_srfi64_SOURCES}")
add_dependencies(check scm-srfi64-extras)
@@ -101,11 +93,9 @@ set(GUILE_DEPENDS
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-scm
- "${test_scm_SCHEME}"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
- )
+ SOURCES "${test_scm_SCHEME}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests("${test_scm_SCHEME}")
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index ac8e67b98..cc950befa 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -256,21 +256,8 @@ function(gnc_add_scheme_targets)
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
endfunction()
-function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
- MAKE_LINKS)
- if(MAKE_LINKS)
- make_scheme_targets("${_TARGET}"
- SOURCES "${_SOURCE_FILES}"
- OUTPUT_DIR "${_OUTPUT_DIR}"
- DEPENDS "${_GUILE_DEPENDS}"
- MAKE_LINKS)
- else()
- make_scheme_targets("${_TARGET}"
- SOURCES "${_SOURCE_FILES}"
- OUTPUT_DIR "${_OUTPUT_DIR}"
- DEPENDS "${_GUILE_DEPENDS}"
- MAKE_LINKS)
- endif()
+function(gnc_add_scheme_test_targets _TARGET)
+ make_scheme_targets(${_TARGET} ${ARGN})
add_dependencies(check ${_TARGET})
endfunction()
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index dc05fb7d2..23f60addf 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -60,11 +60,9 @@ set(GUILE_DEPENDS test-core-guile)
gnc_add_scheme_test_targets(scm-test-core
- ${test_core_SCHEME}
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- FALSE
- )
+ SOURCES ${test_core_SCHEME}
+ OUTPUT_DIR ${GUILE_OUTPUT_DIR}
+ DEPENDS "${GUILE_DEPENDS}")
add_dependencies(check scm-test-core)
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 03be6eb42..76c9f3850 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -37,11 +37,9 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
- "test-load-gnome-utils-module.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "test-load-gnome-utils-module.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests(test-load-gnome-utils-module.scm)
diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt
index 005ba5c4f..cbf33eeb1 100644
--- a/gnucash/import-export/qif-imp/test/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt
@@ -23,11 +23,9 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_qifimp_test_with_srfi64_SOURCES}")
gnc_add_scheme_test_targets(scm-test-qif-imp-srfi64
- "${scm_qifimp_test_with_srfi64_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-srfi64-extras"
- FALSE
- )
+ SOURCES "${scm_qifimp_test_with_srfi64_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
add_dependencies(check scm-qif-import-2 scm-qif-import)
endif()
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 2ac1394fd..4f6601376 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -39,33 +39,27 @@ set(GUILE_DEPENDS
)
if (HAVE_SRFI64)
- gnc_add_scheme_test_targets(scm-test-reports-standard-srfi64
- "${scm_test_with_srfi64_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-srfi64-extras"
- FALSE
- )
+ gnc_add_scheme_test_targets(scm-test-reports-standard-srfi64
+ SOURCES "${scm_test_with_srfi64_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
+ gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
- gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
- if (HAVE_TEXT_PORTS)
- gnc_add_scheme_test_targets(scm-test-reports-standard-tp
- "${scm_test_with_textual_ports_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-srfi64-extras"
- FALSE
- )
- gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
- endif()
+ if (HAVE_TEXT_PORTS)
+ gnc_add_scheme_test_targets(scm-test-reports-standard-tp
+ SOURCES "${scm_test_with_textual_ports_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
+ gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
+ endif()
endif()
gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
gnc_add_scheme_test_targets(scm-test-reports-standard
- "${scm_test_reports_standard_SOURCES}"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${scm_test_reports_standard_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
add_dependencies(check scm-test-reports-standard)
diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt
index 27fbdea0b..2ac920ad3 100644
--- a/gnucash/report/test/CMakeLists.txt
+++ b/gnucash/report/test/CMakeLists.txt
@@ -38,29 +38,23 @@ set(GUILE_DEPENDS
gnc_add_scheme_tests("${scm_test_report_SOURCES}")
if (HAVE_SRFI64)
- gnc_add_scheme_test_targets(scm-test-report-srfi64
- "${scm_test_report_with_srfi64_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-srfi64-extras"
- FALSE
- )
+ gnc_add_scheme_test_targets(scm-test-report-srfi64
+ SOURCES "${scm_test_report_with_srfi64_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
- gnc_add_scheme_tests ("${scm_test_report_with_srfi64_SOURCES}")
+ gnc_add_scheme_tests ("${scm_test_report_with_srfi64_SOURCES}")
endif()
gnc_add_scheme_test_targets(scm-test-report
- "test-report-extras.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
- )
+ SOURCES "test-report-extras.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_test_targets(scm-test-report-2
- "${scm_test_report_SOURCES}"
- "tests"
- "scm-test-report"
- FALSE
-)
+ SOURCES "${scm_test_report_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "scm-test-report")
add_dependencies(check scm-test-report)
set_dist_list(test_report_DIST
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 8c4da4e5f..96fab0369 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -48,30 +48,24 @@ set (test_app_utils_scheme_SRFI64_SOURCES
)
gnc_add_scheme_test_targets(scm-test-load-app-utils-module
- "test-load-app-utils-module.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "test-load-app-utils-module.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_test_targets(scm-test-c-interface
- "test-c-interface.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "test-c-interface.scm"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_tests("${test_app_utils_scheme_SOURCES}")
if (HAVE_SRFI64)
- gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
- "${test_app_utils_scheme_SRFI64_SOURCES}"
- "tests"
- "${GUILE_DEPENDS};scm-srfi64-extras"
- FALSE
- )
+ gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
+ SOURCES "${test_app_utils_scheme_SRFI64_SOURCES}"
+ OUTPUT_DIR "tests"
+ DEPENDS "${GUILE_DEPENDS};scm-srfi64-extras")
- gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
+ gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
endif()
# Doesn't work yet:
commit c05281c582de9f58f7efe0552fe79da396702424
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 8 22:29:01 2020 +0100
Use new keyword parameters for all calls to gnc_add_scheme_targets
diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt
index dcb0b7872..2acf9f93c 100644
--- a/bindings/guile/CMakeLists.txt
+++ b/bindings/guile/CMakeLists.txt
@@ -73,11 +73,9 @@ set(GUILE_OUTPUT_DIR gnucash)
set(GUILE_DEPENDS gnc-core-utils gnucash-guile)
gnc_add_scheme_targets(scm-core-utils
- "${core_utils_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${core_utils_SCHEME}"
+ OUTPUT_DIR ${GUILE_OUTPUT_DIR}
+ DEPENDS "${GUILE_DEPENDS}")
set (engine_SCHEME_0
commodity-table.scm
@@ -105,25 +103,20 @@ set(GUILE_DEPENDS
gnc_add_scheme_targets(scm-engine-0
- "${engine_SCHEME_0}"
- "gnucash/engine"
- "${GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${engine_SCHEME_0}"
+ OUTPUT_DIR "gnucash/engine"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-engine-1
- "${engine_SCHEME_1}"
- gnucash
- "scm-engine-0;${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${engine_SCHEME_1}"
+ OUTPUT_DIR gnucash
+ DEPENDS "scm-engine-0;${GUILE_DEPENDS}")
gnc_add_scheme_targets(scm-engine-2
- "${engine_SCHEME_2}"
- gnucash
- "scm-engine-1;${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${engine_SCHEME_2}"
+ OUTPUT_DIR gnucash
+ DEPENDS "scm-engine-1;${GUILE_DEPENDS}")
add_custom_target(scm-engine ALL DEPENDS scm-engine-2 scm-engine-1 scm-engine-0)
@@ -131,11 +124,9 @@ set(scm_gnc_module_DEPENDS
gnucash-guile)
gnc_add_scheme_targets(scm-gnc-module
- gnc-module.scm
- gnucash
- "${scm_gnc_module_DEPENDS}"
- FALSE
-)
+ SOURCES gnc-module.scm
+ OUTPUT_DIR gnucash
+ DEPENDS "${scm_gnc_module_DEPENDS}")
set_local_dist(guile_DIST_local
CMakeLists.txt
diff --git a/borrowed/guile-json/CMakeLists.txt b/borrowed/guile-json/CMakeLists.txt
index e8bd8a692..d80e444a2 100644
--- a/borrowed/guile-json/CMakeLists.txt
+++ b/borrowed/guile-json/CMakeLists.txt
@@ -5,18 +5,14 @@ set (scm-guile-json-details
)
gnc_add_scheme_targets (guile-json-details
- "${scm-guile-json-details}"
- gnucash/json
- ""
- TRUE
-)
+ SOURCES "${scm-guile-json-details}"
+ OUTPUT_DIR gnucash/json
+ MAKE_LINKS)
gnc_add_scheme_targets (guile-json
- json.scm
- "gnucash"
- "guile-json-details"
- FALSE
-)
+ SOURCES json.scm
+ OUTPUT_DIR "gnucash"
+ DEPENDS "guile-json-details")
set_local_dist(guile-json_DIST_LOCAL
AUTHORS
diff --git a/borrowed/guile-json/json/CMakeLists.txt b/borrowed/guile-json/json/CMakeLists.txt
index 50aa82ccc..768f905dc 100644
--- a/borrowed/guile-json/json/CMakeLists.txt
+++ b/borrowed/guile-json/json/CMakeLists.txt
@@ -5,11 +5,9 @@ set (scm-guile-json-details
)
gnc_add_scheme_targets (guile-json-details
- "${scm-guile-json-details}"
- gnucash/json
- ""
- TRUE
-)
+ SOURCES "${scm-guile-json-details}"
+ OUTPUT_DIR gnucash/json
+ MAKE_LINKS)
set_dist_list (guile-json-details_DIST
CMakeLists.txt
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 39f21a95f..ac8e67b98 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -244,23 +244,14 @@ function(make_scheme_targets _TARGET)
message("TARGET_FILES are ${_TARGET_FILES}")
endif()
add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
+
set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
+ set(_SOURCE_FILES "${SCHEME_TGT_SOURCES}" PARENT_SCOPE)
+ set(_OUTPUT_DIR "${SCHEME_TGT_OUTPUT_DIR}" PARENT_SCOPE)
endfunction()
-function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
- MAKE_LINKS)
- if(MAKE_LINKS)
- make_scheme_targets("${_TARGET}"
- SOURCES "${_SOURCE_FILES}"
- OUTPUT_DIR "${_OUTPUT_DIR}"
- DEPENDS "${_GUILE_DEPENDS}"
- MAKE_LINKS)
- else()
- make_scheme_targets("${_TARGET}"
- SOURCES "${_SOURCE_FILES}"
- OUTPUT_DIR "${_OUTPUT_DIR}"
- DEPENDS "${_GUILE_DEPENDS}")
- endif()
+function(gnc_add_scheme_targets)
+ make_scheme_targets(${ARGN})
install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${_OUTPUT_DIR})
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
endfunction()
@@ -277,7 +268,8 @@ function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DE
make_scheme_targets("${_TARGET}"
SOURCES "${_SOURCE_FILES}"
OUTPUT_DIR "${_OUTPUT_DIR}"
- DEPENDS "${_GUILE_DEPENDS}")
+ DEPENDS "${_GUILE_DEPENDS}"
+ MAKE_LINKS)
endif()
add_dependencies(check ${_TARGET})
endfunction()
@@ -344,5 +336,8 @@ ${DEPWARNING}
(module-use! i (resolve-interface '(${_NEWMOD}))))")
endif()
- gnc_add_scheme_targets("${_TARGET}" "${SOURCEFILE}" "${MODPATH}" "${_DEPENDS}" FALSE)
+ gnc_add_scheme_targets("${_TARGET}"
+ SOURCES "${SOURCEFILE}"
+ OUTPUT_DIR "${MODPATH}"
+ DEPENDS "${_DEPENDS}")
endfunction()
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 8ae99ad98..7482e8b9c 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -252,10 +252,9 @@ endforeach()
gnc_add_scheme_targets(price-quotes
- price-quotes.scm
- gnucash
- "scm-engine;scm-app-utils;scm-gnome-utils"
- FALSE)
+ SOURCES price-quotes.scm
+ OUTPUT_DIR gnucash
+ DEPENDS "scm-engine;scm-app-utils;scm-gnome-utils")
set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index b19d514f0..133665686 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -256,19 +256,16 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
set(GUILE_DEPENDS gncmod-gnome-utils scm-gnc-module scm-engine scm-app-utils)
gnc_add_scheme_targets(scm-gnome-utils-1
- gnome-utils.scm
- gnucash
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES gnome-utils.scm
+ OUTPUT_DIR gnucash
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_targets(scm-gnome-utils-2
- gnc-menu-extensions.scm
- "gnucash/gnome-utils"
- "${GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES gnc-menu-extensions.scm
+ OUTPUT_DIR "gnucash/gnome-utils"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
add_custom_target(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-1)
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 7a1824154..00ded550d 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -241,7 +241,6 @@ set(gnome_SCHEME
report-menus.scm
)
-set(GUILE_OUTPUT_DIR gnucash)
set(GUILE_DEPENDS
gncmod-gnome-utils
scm-engine
@@ -253,11 +252,9 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-gnome
-"${gnome_SCHEME}"
-${GUILE_OUTPUT_DIR}
-"${GUILE_DEPENDS}"
-FALSE
-)
+ SOURCES "${gnome_SCHEME}"
+ OUTPUT_DIR gnucash
+ DEPENDS "${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash report report-gnome" "gnucash report-menus" "scm-gnome" "")
diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt
index ac7315628..d5b07a730 100644
--- a/gnucash/html/CMakeLists.txt
+++ b/gnucash/html/CMakeLists.txt
@@ -40,11 +40,9 @@ set(GUILE_OUTPUT_DIR gnucash)
set(GUILE_DEPENDS gncmod-html gnucash-guile)
gnc_add_scheme_targets(scm-gnc-html
- "${gnc_html_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${gnc_html_SCHEME}"
+ OUTPUT_DIR ${GUILE_OUTPUT_DIR}
+ DEPENDS "${GUILE_DEPENDS}")
set_dist_list(html_DIST CMakeLists.txt ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST} html.scm)
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index e3bf7a078..4d9c73f3f 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -72,25 +72,20 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-qif-import-0
- "${qif_import_SCHEME_0}"
- "gnucash"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${qif_import_SCHEME_0}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_targets(scm-qif-import-2
- "${qif_import_SCHEME_2}"
- "gnucash"
- "${GUILE_DEPENDS};scm-qif-import-0"
- FALSE
-)
+ SOURCES "${qif_import_SCHEME_2}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS "${GUILE_DEPENDS};scm-qif-import-0")
gnc_add_scheme_targets(scm-qif-import
- "${qif_import_SCHEME}"
- "gnucash/qif-import"
- "${GUILE_DEPENDS};scm-qif-import-0"
- TRUE
-)
+ SOURCES "${qif_import_SCHEME}"
+ OUTPUT_DIR "gnucash/qif-import"
+ DEPENDS "${GUILE_DEPENDS};scm-qif-import-0"
+ MAKE_LINKS)
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash import-export qif-import" "gnucash qif-import" "scm-qif-import-2" "")
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 958a1077d..e4489c0ee 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -98,32 +98,25 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-report-1
- "${report_SCHEME_1}"
- "gnucash/report"
- "${GUILE_DEPENDS}"
- FALSE
-)
+ SOURCES "${report_SCHEME_1}"
+ OUTPUT_DIR "gnucash/report"
+ DEPENDS "${GUILE_DEPENDS}")
gnc_add_scheme_targets(scm-report-2
- "${report_SCHEME_2}"
- "gnucash"
- scm-report-1
- TRUE
-)
+ SOURCES "${report_SCHEME_2}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS scm-report-1
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-report-eguile-parts
- "${report_eguile_parts_SCHEME}"
- "gnucash/eguile"
- scm-report-2
- FALSE
-)
+ SOURCES "${report_eguile_parts_SCHEME}"
+ OUTPUT_DIR "gnucash/eguile"
+ DEPENDS scm-report-2)
gnc_add_scheme_targets(scm-report-eguile
- "${report_eguile_SCHEME}"
- "gnucash"
- scm-report-eguile-parts
- FALSE
-)
+ SOURCES "${report_eguile_SCHEME}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS scm-report-eguile-parts)
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash report eguile-gnc" "gnucash eguile" "scm-report-eguile" "")
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 07c0fce19..7efb7367e 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -114,60 +114,52 @@ set(scm_rpt_std_GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-reports-common
- "${reports_common_SCHEME}"
- "gnucash/reports"
- "scm-reports-common-links;${scm_rpt_std_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_common_SCHEME}"
+ OUTPUT_DIR "gnucash/reports"
+ DEPENDS "scm-reports-common-links;${scm_rpt_std_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-standard-with-exposed-generator
- "${reports_standard_with_exposed_generator_SCHEME}"
- "gnucash/reports/standard"
- "${scm_rpt_std_w_exposed_generator_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_standard_with_exposed_generator_SCHEME}"
+ OUTPUT_DIR "gnucash/reports/standard"
+ DEPENDS "${scm_rpt_std_w_exposed_generator_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-rpt-reports
- "${reports_SCHEME}"
- "gnucash"
- "scm-reports-standard-with-exposed-generator;${scm_rpts_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_SCHEME}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS "scm-reports-standard-with-exposed-generator;${scm_rpts_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-standard
- "${reports_standard_SCHEME}"
- "gnucash/reports/standard"
- "scm-reports-common;${scm_rpt_std_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_standard_SCHEME}"
+ OUTPUT_DIR "gnucash/reports/standard"
+ DEPENDS "scm-reports-common;${scm_rpt_std_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-example
- "${reports_example_SCHEME}"
- "gnucash/reports/example"
- "${scm_rpt_example_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_example_SCHEME}"
+ OUTPUT_DIR "gnucash/reports/example"
+ DEPENDS "${scm_rpt_example_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-us
- "${reports_us_SCHEME}"
- "gnucash/reports/locale-specific/us"
- "${scm_rpt_locale_specific_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_us_SCHEME}"
+ OUTPUT_DIR "gnucash/reports/locale-specific/us"
+ DEPENDS "${scm_rpt_locale_specific_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-de_DE
- "${reports_de_DE_SCHEME}"
- "gnucash/reports/locale-specific/de_DE"
- "${scm_rpt_locale_specific_GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${reports_de_DE_SCHEME}"
+ OUTPUT_DIR "gnucash/reports/locale-specific/de_DE"
+ DEPENDS "${scm_rpt_locale_specific_GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-reports-standard-2
- "${reports_standard_SCHEME_2}"
- "gnucash/reports/standard"
- "scm-rpt-reports"
- TRUE
-)
+ SOURCES "${reports_standard_SCHEME_2}"
+ OUTPUT_DIR "gnucash/reports/standard"
+ DEPENDS "scm-rpt-reports"
+ MAKE_LINKS)
add_custom_target(scm-reports ALL DEPENDS
scm-reports-standard
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 89dd1fda8..f0a7817d7 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -6,7 +6,6 @@ set(stylesheets_SCHEME
head-or-tail.scm
)
-set(GUILE_OUTPUT_DIR gnucash/report/stylesheets)
set(GUILE_DEPENDS
scm-gnc-module
scm-core-utils
@@ -17,11 +16,10 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-report-stylesheets-1
- "${stylesheets_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${stylesheets_SCHEME}"
+ OUTPUT_DIR "gnucash/report/stylesheets"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash report stylesheet-easy" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "")
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 96eafc2c0..105d7ed91 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -175,18 +175,15 @@ set(GUILE_DEPENDS
)
gnc_add_scheme_targets(scm-app-utils-1
- "${app_utils_SCHEME_1}"
- "gnucash/app-utils"
- "${GUILE_DEPENDS}"
- TRUE
-)
+ SOURCES "${app_utils_SCHEME_1}"
+ OUTPUT_DIR "gnucash/app-utils"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
gnc_add_scheme_targets(scm-app-utils-2
- "${app_utils_SCHEME_2}"
- "gnucash"
- "scm-app-utils-1"
- FALSE
-)
+ SOURCES "${app_utils_SCHEME_2}"
+ OUTPUT_DIR "gnucash"
+ DEPENDS "scm-app-utils-1")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("migrate-prefs" "" "" "")
diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
index 7e68ab6d3..fc9dff10e 100644
--- a/libgnucash/tax/CMakeLists.txt
+++ b/libgnucash/tax/CMakeLists.txt
@@ -33,30 +33,26 @@ set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax.scm)
set(GUILE_DEPENDS scm-app-utils scm-gnc-module)
gnc_add_scheme_targets(scm-tax-us-1
-"${gncmod_tax_us_SCHEME_1}"
-"gnucash/locale/us/tax"
-"${GUILE_DEPENDS}"
-TRUE
-)
+ SOURCES "${gncmod_tax_us_SCHEME_1}"
+ OUTPUT_DIR "gnucash/locale/us/tax"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
+
gnc_add_scheme_targets(scm-tax-us-2
-"${gncmod_tax_us_SCHEME_2}"
-"gnucash/locale/us"
-"scm-tax-us-1;${GUILE_DEPENDS}"
-FALSE
-)
+ SOURCES "${gncmod_tax_us_SCHEME_2}"
+ OUTPUT_DIR "gnucash/locale/us"
+ DEPENDS "scm-tax-us-1;${GUILE_DEPENDS}")
gnc_add_scheme_targets(scm-tax-de_DE-1
-"${gncmod_tax_de_DE_SCHEME_1}"
-"gnucash/locale/de_DE/tax"
-"${GUILE_DEPENDS}"
-TRUE
-)
+ SOURCES "${gncmod_tax_de_DE_SCHEME_1}"
+ OUTPUT_DIR "gnucash/locale/de_DE/tax"
+ DEPENDS "${GUILE_DEPENDS}"
+ MAKE_LINKS)
+
gnc_add_scheme_targets(scm-tax-de_DE-2
-"${gncmod_tax_de_DE_SCHEME_2}"
-"gnucash/locale/de_DE"
-"scm-tax-de_DE-1;${GUILE_DEPENDS}"
-FALSE
-)
+ SOURCES "${gncmod_tax_de_DE_SCHEME_2}"
+ OUTPUT_DIR "gnucash/locale/de_DE"
+ DEPENDS "scm-tax-de_DE-1;${GUILE_DEPENDS}")
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash locale de_DE tax" "scm-tax-de_DE-2" "")
commit 91ecdcb5dd1763cc13fa575950e5d26a4d39c866
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 8 21:38:03 2020 +0100
Rework SchemeTargets module to use keyword parameters
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 234d580c6..39f21a95f 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -104,14 +104,19 @@ macro(find_guile_dirs)
"{GNC_HOME}/${GUILE_REL_UNIX_SITECCACHEDIR}")
endmacro(find_guile_dirs)
-function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
- MAKE_LINKS)
+function(make_scheme_targets _TARGET)
+ set(noValues MAKE_LINKS)
+ set(singleValues OUTPUT_DIR)
+ set(multiValues SOURCES DEPENDS)
+ cmake_parse_arguments(SCHEME_TGT "${noValues}" "${singleValues}" "${multiValues}" ${ARGN})
+
set(__DEBUG FALSE)
if (__DEBUG)
message("Parameters to COMPILE_SCHEME for target ${_TARGET}")
- message(" SOURCE_FILES: ${_SOURCE_FILES}")
- message(" GUILE_DEPENDS: ${_GUILE_DEPENDS}")
- message(" DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}")
+ message(" SOURCE_FILES: ${SCHEME_TGT_SOURCES}")
+ message(" GUILE_DEPENDS: ${SCHEME_TGT_DEPENDS}")
+ message(" MAKE_LINKS: ${SCHEME_TGT_MAKE_LINKS}")
+ message(" DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}, ${SCHEME_TGT_OUTPUT_DIR}")
endif()
set(_CMD "create_symlink")
if(WIN32)
@@ -133,11 +138,11 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
endif()
# If links are requested, we simply link (or copy, for Windows) each source file to the dest directory
- if(MAKE_LINKS)
- set(_LINK_DIR ${CMAKE_BINARY_DIR}/${GUILE_REL_UNIX_SITEDIR}/${_OUTPUT_DIR})
+ if(SCHEME_TGT_MAKE_LINKS)
+ set(_LINK_DIR ${CMAKE_BINARY_DIR}/${GUILE_REL_UNIX_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
file(MAKE_DIRECTORY ${_LINK_DIR})
set(_SCHEME_LINKS "")
- foreach(scheme_file ${_SOURCE_FILES})
+ foreach(scheme_file ${SCHEME_TGT_SOURCES})
set(_SOURCE_FILE ${current_srcdir}/${scheme_file})
if(IS_ABSOLUTE ${scheme_file})
set(_SOURCE_FILE ${scheme_file})
@@ -172,14 +177,14 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
set(_TARGET_FILES "")
- foreach(source_file ${_SOURCE_FILES})
- set(guile_depends ${_GUILE_DEPENDS})
+ foreach(source_file ${SCHEME_TGT_SOURCES})
+ set(guile_depends ${SCHEME_TGT_DEPENDS})
get_filename_component(basename ${source_file} NAME_WE)
set(output_file ${basename}.go)
- set(_TMP_OUTPUT_DIR ${_OUTPUT_DIR})
+ set(_TMP_OUTPUT_DIR ${SCHEME_TGT_OUTPUT_DIR})
if (_TMP_OUTPUT_DIR)
- set(output_file ${_OUTPUT_DIR}/${basename}.go)
+ set(output_file ${SCHEME_TGT_OUTPUT_DIR}/${basename}.go)
endif()
set(output_file ${_GUILE_CACHE_DIR}/${output_file})
list(APPEND _TARGET_FILES ${output_file})
@@ -244,16 +249,36 @@ endfunction()
function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
- make_scheme_targets("${_TARGET}" "${_SOURCE_FILES}" "${_OUTPUT_DIR}"
- "${_GUILE_DEPENDS}" "${MAKE_LINKS}")
+ if(MAKE_LINKS)
+ make_scheme_targets("${_TARGET}"
+ SOURCES "${_SOURCE_FILES}"
+ OUTPUT_DIR "${_OUTPUT_DIR}"
+ DEPENDS "${_GUILE_DEPENDS}"
+ MAKE_LINKS)
+ else()
+ make_scheme_targets("${_TARGET}"
+ SOURCES "${_SOURCE_FILES}"
+ OUTPUT_DIR "${_OUTPUT_DIR}"
+ DEPENDS "${_GUILE_DEPENDS}")
+ endif()
install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${_OUTPUT_DIR})
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
endfunction()
function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
- make_scheme_targets("${_TARGET}" "${_SOURCE_FILES}" "${_OUTPUT_DIR}"
- "${_GUILE_DEPENDS}" "${MAKE_LINKS}")
+ if(MAKE_LINKS)
+ make_scheme_targets("${_TARGET}"
+ SOURCES "${_SOURCE_FILES}"
+ OUTPUT_DIR "${_OUTPUT_DIR}"
+ DEPENDS "${_GUILE_DEPENDS}"
+ MAKE_LINKS)
+ else()
+ make_scheme_targets("${_TARGET}"
+ SOURCES "${_SOURCE_FILES}"
+ OUTPUT_DIR "${_OUTPUT_DIR}"
+ DEPENDS "${_GUILE_DEPENDS}")
+ endif()
add_dependencies(check ${_TARGET})
endfunction()
commit ba7362d89506be2809f831028f1139831e9231ad
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Mar 14 10:34:09 2020 +0100
CMake - Drop oldstyle endfunction invocations
The form without repeating the function name is preferred
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 218e49613..234d580c6 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -67,7 +67,7 @@ function(find_one_guile_dir _DIRCLASS _DIRCMD _PREFIX)
set(GUILE_REL_UNIX_${CLASS_UPPER} ${CMD_REL_UNIX_OUTPUT} PARENT_SCOPE)
endif()
-endfunction(find_one_guile_dir)
+endfunction()
# Query the guile executable for path information. We're interested in guile's
# datadir, libdir, sitedir, ccachedir and siteccachedir
@@ -240,7 +240,7 @@ function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
endif()
add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
-endfunction(make_scheme_targets)
+endfunction()
function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
@@ -248,14 +248,14 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
"${_GUILE_DEPENDS}" "${MAKE_LINKS}")
install(FILES ${_TARGET_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITECCACHEDIR}/${_OUTPUT_DIR})
install(FILES ${_SOURCE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GUILE_REL_SITEDIR}/${_OUTPUT_DIR})
-endfunction(gnc_add_scheme_targets)
+endfunction()
function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
make_scheme_targets("${_TARGET}" "${_SOURCE_FILES}" "${_OUTPUT_DIR}"
"${_GUILE_DEPENDS}" "${MAKE_LINKS}")
add_dependencies(check ${_TARGET})
-endfunction(gnc_add_scheme_test_targets)
+endfunction()
# Function to write boilerplate code for deprecated guile modules
# All but the _OLDMOD parameter are optional
@@ -320,4 +320,4 @@ ${DEPWARNING}
endif()
gnc_add_scheme_targets("${_TARGET}" "${SOURCEFILE}" "${MODPATH}" "${_DEPENDS}" FALSE)
-endfunction(gnc_add_scheme_deprecated_module)
+endfunction()
Summary of changes:
bindings/guile/CMakeLists.txt | 41 ++-
bindings/guile/test/CMakeLists.txt | 57 ++--
borrowed/guile-json/CMakeLists.txt | 16 +-
borrowed/guile-json/json/CMakeLists.txt | 8 +-
common/cmake_modules/GncAddSchemeTargets.cmake | 176 ++++++++----
common/test-core/CMakeLists.txt | 13 +-
gnucash/CMakeLists.txt | 7 +-
gnucash/gnome-utils/CMakeLists.txt | 17 +-
gnucash/gnome-utils/test/CMakeLists.txt | 8 +-
gnucash/gnome/CMakeLists.txt | 14 +-
gnucash/html/CMakeLists.txt | 8 +-
gnucash/import-export/qif-imp/CMakeLists.txt | 35 +--
gnucash/import-export/qif-imp/test/CMakeLists.txt | 8 +-
gnucash/report/CMakeLists.txt | 65 +++--
gnucash/report/reports/CMakeLists.txt | 312 +++++++++++++++------
.../report/reports/standard/test/CMakeLists.txt | 36 +--
gnucash/report/stylesheets/CMakeLists.txt | 35 ++-
gnucash/report/test/CMakeLists.txt | 33 +--
libgnucash/app-utils/CMakeLists.txt | 26 +-
libgnucash/app-utils/test/CMakeLists.txt | 28 +-
libgnucash/tax/CMakeLists.txt | 46 +--
21 files changed, 586 insertions(+), 403 deletions(-)
More information about the gnucash-changes
mailing list