From 06bc06437942fa5e7ab1522339050d5a129ef7fb Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Fri, 17 May 2019 16:56:45 -0700
Subject: [PATCH] Fix dependencies for Scheme tests requiring SRFI64.

So ninja check passes without having run ninja first.
---
 gnucash/report/report-system/test/CMakeLists.txt    | 8 ++++++++
 gnucash/report/reports/CMakeLists.txt               | 6 +++---
 gnucash/report/reports/standard/test/CMakeLists.txt | 7 +++++++
 libgnucash/app-utils/test/CMakeLists.txt            | 7 +++++++
 libgnucash/engine/test/CMakeLists.txt               | 2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index 4c34e222ba..7167a516fa 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -32,10 +32,18 @@ set(GUILE_DEPENDS
   scm-test-engine
   scm-scm
   scm-report-system-3
+  scm-test-report-system
   )
 gnc_add_scheme_tests("${scm_test_report_system_SOURCES}")
 
 if (HAVE_SRFI64)
+  gnc_add_scheme_test_targets(scm-test-report-system-srfi64
+    "${scm_test_report_system_with_srfi64_SOURCES}"
+    "tests"
+    "${GUILE_DEPENDS};scm-srfi64-extras"
+    FALSE
+    )
+
   gnc_add_scheme_tests ("${scm_test_report_system_with_srfi64_SOURCES}")
 endif (HAVE_SRFI64)
 
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 7387bba208..a232ba8780 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -92,21 +92,21 @@ set(scm_rpt_std_GUILE_DEPENDS
 gnc_add_scheme_targets(scm-rpt-reports
   "${reports_SCHEME}"
   "gnucash/report"
-  "scm-reports-standard;${scm_rpts_GUILE_DEPENDS}"
+  "${scm_rpts_GUILE_DEPENDS}"
   TRUE
 )
 
 gnc_add_scheme_targets(scm-reports-common
   "${reports_common_SCHEME}"
   "gnucash/report/reports"
-  "scm-reports-common-links;${scm_rpt_std_GUILE_DEPENDS}"
+  "scm-reports-common-links;scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
   TRUE
 )
 
 gnc_add_scheme_targets(scm-reports-standard
   "${reports_standard_SCHEME}"
   "gnucash/report/reports/standard"
-  "${scm_rpt_std_GUILE_DEPENDS}"
+  "scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
   TRUE
 )
 
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 36e899751f..081d8cacc2 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -34,6 +34,13 @@ 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_tests("${scm_test_with_srfi64_SOURCES}")
   if (HAVE_TEXT_PORTS)
     gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index de20eecb83..369f27a8e3 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -66,6 +66,13 @@ gnc_add_scheme_test_targets(scm-test-c-interface
 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_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
 endif ()
 
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 60c1f93fa9..ad4992cbbf 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -252,7 +252,7 @@ endif (HAVE_SRFI64)
 gnc_add_scheme_test_targets(scm-test-engine
   "${engine_test_SCHEME}"
   "tests"
-  "${GUILE_DEPENDS};scm-test-engine-extras"
+  "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
   FALSE
   )