mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Move direct check dependencies to the originating CMakeLists.txt.
Removing transitive dependencies from being declared direct.
This commit is contained in:
@@ -579,12 +579,6 @@ GNC_GTEST_CONFIGURE()
|
|||||||
# There are targets that need to build before tests will run
|
# There are targets that need to build before tests will run
|
||||||
ADD_CUSTOM_TARGET(check
|
ADD_CUSTOM_TARGET(check
|
||||||
COMMAND ${CMAKE_CTEST_COMMAND}
|
COMMAND ${CMAKE_CTEST_COMMAND}
|
||||||
DEPENDS gnucash scm-app-utils scm-gnome-utils scm-report-gnome
|
|
||||||
scm-engine scm-gnc-module scm-test-engine scm-report-system-3
|
|
||||||
scm-test-core scm-test-report-system scm-standard-reports-2
|
|
||||||
scm-test-standard-reports foo gncmodfoo baz gncmodbaz
|
|
||||||
bar gncmodbar gncmod_agedver gncmod_incompatdep
|
|
||||||
gncmod_futuremodsys check-po test-core-guile gncmod-backend-xml
|
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(gnucash_DOCS
|
SET(gnucash_DOCS
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ GNC_ADD_SCHEME_TARGETS(scm-test-core
|
|||||||
FALSE
|
FALSE
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(check scm-test-core)
|
||||||
|
|
||||||
IF(NOT GTEST_SHARED_LIB)
|
IF(NOT GTEST_SHARED_LIB)
|
||||||
SET (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
|
SET (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
|
||||||
ADD_LIBRARY(gtest STATIC ${lib_gtest_SOURCES})
|
ADD_LIBRARY(gtest STATIC ${lib_gtest_SOURCES})
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ SET(REPORT_GNOME_TEST_INCLUDE_DIRS
|
|||||||
${GUILE_INCLUDE_DIRS}
|
${GUILE_INCLUDE_DIRS}
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
SET(REPORT_GNOME_TEST_LIBS gnc-module)
|
SET(REPORT_GNOME_TEST_LIBS gnc-module)
|
||||||
|
|
||||||
GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
|
GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
|
||||||
@@ -15,8 +17,12 @@ SET(GUILE_DEPENDS
|
|||||||
gnc-module
|
gnc-module
|
||||||
scm-engine
|
scm-engine
|
||||||
scm-report-gnome
|
scm-report-gnome
|
||||||
|
scm-business-reports
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_custom_target(test-report-gnome ALL DEPENDS ${GUILE_DEPENDS})
|
||||||
|
add_dependencies(test-link-module-report-gnome test-report-gnome)
|
||||||
|
|
||||||
GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module
|
GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module
|
||||||
"test-load-report-gnome-module.scm"
|
"test-load-report-gnome-module.scm"
|
||||||
"gnucash/reports"
|
"gnucash/reports"
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2
|
|||||||
FALSE
|
FALSE
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(check scm-test-report-system)
|
||||||
SET_DIST_LIST(test_report_system_DIST
|
SET_DIST_LIST(test_report_system_DIST
|
||||||
CMakeLists.txt
|
CMakeLists.txt
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ set(GUILE_DEPENDS
|
|||||||
scm-standard-reports
|
scm-standard-reports
|
||||||
scm-report-stylesheets
|
scm-report-stylesheets
|
||||||
)
|
)
|
||||||
GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")
|
|
||||||
|
|
||||||
GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
|
GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
|
||||||
"${scm_test_report_SUPPORT}"
|
"${scm_test_report_SUPPORT}"
|
||||||
@@ -34,9 +33,10 @@ GNC_ADD_SCHEME_TARGETS(scm-test-standard-support
|
|||||||
GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
|
GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
|
||||||
"${scm_test_standard_reports_SOURCES}"
|
"${scm_test_standard_reports_SOURCES}"
|
||||||
gnucash/report/standard-reports/test
|
gnucash/report/standard-reports/test
|
||||||
scm-test-standard-support
|
"scm-test-standard-support"
|
||||||
FALSE
|
FALSE
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(check scm-test-standard-reports)
|
||||||
SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt
|
SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt
|
||||||
${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT})
|
${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT})
|
||||||
|
|||||||
@@ -234,6 +234,7 @@ GNC_ADD_SCHEME_TARGETS(scm-test-engine
|
|||||||
FALSE
|
FALSE
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(check scm-test-engine)
|
||||||
GNC_ADD_SCHEME_TESTS("${engine_test_SCHEME}")
|
GNC_ADD_SCHEME_TESTS("${engine_test_SCHEME}")
|
||||||
|
|
||||||
SET(test_engine_SOURCES_DIST
|
SET(test_engine_SOURCES_DIST
|
||||||
|
|||||||
@@ -188,3 +188,5 @@ ADD_CUSTOM_TARGET(check-po
|
|||||||
-P check-po.cmake
|
-P check-po.cmake
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_dependencies(check check-po)
|
||||||
|
|||||||
Reference in New Issue
Block a user