From f4965ae2aca1deca7eddb289475dc2b58d41570d Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 18 Feb 2018 22:16:27 -0800
Subject: [PATCH] Move direct check dependencies to the originating
 CMakeLists.txt.

Removing transitive dependencies from being declared direct.
---
 CMakeLists.txt                                      | 6 ------
 common/test-core/CMakeLists.txt                     | 2 ++
 gnucash/report/report-gnome/test/CMakeLists.txt     | 6 ++++++
 gnucash/report/report-system/test/CMakeLists.txt    | 2 +-
 gnucash/report/standard-reports/test/CMakeLists.txt | 4 ++--
 libgnucash/engine/test/CMakeLists.txt               | 1 +
 po/CMakeLists.txt                                   | 2 ++
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f470c485..08e120690c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,12 +579,6 @@ GNC_GTEST_CONFIGURE()
 # There are targets that need to build before tests will run
 ADD_CUSTOM_TARGET(check
   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
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index 7ebf5146dd..ce4ed3a4ba 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -63,6 +63,8 @@ GNC_ADD_SCHEME_TARGETS(scm-test-core
   FALSE
   )
 
+add_dependencies(check scm-test-core)
+
 IF(NOT GTEST_SHARED_LIB)
   SET (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
   ADD_LIBRARY(gtest STATIC  ${lib_gtest_SOURCES})
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index a6a3689423..ca80468e03 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -3,6 +3,8 @@ SET(REPORT_GNOME_TEST_INCLUDE_DIRS
   ${GUILE_INCLUDE_DIRS}
 
 )
+
+
 SET(REPORT_GNOME_TEST_LIBS gnc-module)
 
 GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
@@ -15,8 +17,12 @@ SET(GUILE_DEPENDS
   gnc-module
   scm-engine
   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
   "test-load-report-gnome-module.scm"
   "gnucash/reports"
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index f2242c6d2e..31c0b16bcb 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -43,7 +43,7 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2
   FALSE
 )
 
-
+add_dependencies(check scm-test-report-system)
 SET_DIST_LIST(test_report_system_DIST
   CMakeLists.txt
   
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 8f3d82b70d..7abc166f90 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -23,7 +23,6 @@ set(GUILE_DEPENDS
   scm-standard-reports
   scm-report-stylesheets
   )
-GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")
 
 GNC_ADD_SCHEME_TARGETS(scm-test-standard-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
   "${scm_test_standard_reports_SOURCES}"
   gnucash/report/standard-reports/test
-  scm-test-standard-support
+  "scm-test-standard-support"
   FALSE
 )
 
+add_dependencies(check scm-test-standard-reports)
 SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt 
   ${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT})
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 4447951496..74ec718e92 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -234,6 +234,7 @@ GNC_ADD_SCHEME_TARGETS(scm-test-engine
   FALSE
   )
 
+add_dependencies(check scm-test-engine)
 GNC_ADD_SCHEME_TESTS("${engine_test_SCHEME}")
 
 SET(test_engine_SOURCES_DIST
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 7b142089bc..aaa69f807d 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -188,3 +188,5 @@ ADD_CUSTOM_TARGET(check-po
            -P check-po.cmake
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+add_dependencies(check check-po)