gnucash maint: Fix intermittent build dependency issue

Geert Janssens gjanssens at code.gnucash.org
Sat Aug 10 15:52:30 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/7d2d3928 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c7e60c1d (commit)



commit 7d2d3928291260edf6ee94fb534e4220dbcdfd17
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 10 19:20:49 2019 +0200

    Fix intermittent build dependency issue
    
    eguile-html-utilities now depends on eguile-gnc so make sure
    the latter is built before the former
    
    Note the master branch has gone a different route:
    eguile-html-utilities and eguile-utilities are no longer modules
    there but included into eguile-gnc via load-from-path
    Hence the dependecy tree is actually the other way around there.
    To keep in mind when merging maint into master next time.

diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index 9fee1071a..c5c57902f 100644
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -46,6 +46,9 @@ install(FILES ${report_system_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/g
 set (report_system_SCHEME
     report-system.scm
     eguile-gnc.scm
+)
+
+set (report_system_SCHEME_1
     eguile-utilities.scm
     eguile-html-utilities.scm
 )
@@ -95,10 +98,17 @@ gnc_add_scheme_targets(scm-report-system-1
   FALSE
 )
 
+gnc_add_scheme_targets(scm-report-system-1a
+  "${report_system_SCHEME_1}"
+  "gnucash/report"
+  scm-report-system-1
+  FALSE
+)
+
 gnc_add_scheme_targets(scm-report-system-2a
   "${report_system_SCHEME_2a}"
   "gnucash/report/report-system"
-  scm-report-system-1
+  scm-report-system-1a
   FALSE
 )
 



Summary of changes:
 gnucash/report/report-system/CMakeLists.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)



More information about the gnucash-changes mailing list