IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use new keyword parameters for all calls to gnc_add_scheme_targets

Browse Source
This commit is contained in:
Geert Janssens 2020-03-08 22:29:01 +01:00
parent 91ecdcb5dd
commit c05281c582
14 changed files with 134 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bindings/guile/CMakeLists.txt
View File

@ -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

16
borrowed/guile-json/CMakeLists.txt
View File

@ -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

8
borrowed/guile-json/json/CMakeLists.txt
View File

@ -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

27
common/cmake_modules/GncAddSchemeTargets.cmake
View File

@ -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()

7
gnucash/CMakeLists.txt
View File

@ -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}

17
gnucash/gnome-utils/CMakeLists.txt
View File

@ -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)

9
gnucash/gnome/CMakeLists.txt
View File

@ -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" "")

8
gnucash/html/CMakeLists.txt
View File

@ -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)

25
gnucash/import-export/qif-imp/CMakeLists.txt
View File

@ -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" "")

33
gnucash/report/CMakeLists.txt
View File

@ -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" "")

72
gnucash/report/reports/CMakeLists.txt
View File

@ -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

10
gnucash/report/stylesheets/CMakeLists.txt
View File

@ -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" "")

17
libgnucash/app-utils/CMakeLists.txt
View File

@ -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" "" "" "")

36
libgnucash/tax/CMakeLists.txt
View File

@ -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" "")