gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Dec 13 19:58:14 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/c2ba88d9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e6c77d40 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d86b30b6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b014d019 (commit)



commit c2ba88d91d1f02be912d476dbc45f7bf27b640b8
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 13 16:57:48 2020 -0800

    Add MAKE_LINKS to app-utils and qif-import scheme targets.
    
    Needed to successfully build on Windows.

diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 9b1a95321..ae6796551 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -76,12 +76,14 @@ set(GUILE_DEPENDS
 gnc_add_scheme_targets(scm-qif-import-0
     SOURCES "${qif_import_SCHEME_0}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "${GUILE_DEPENDS}")
+    DEPENDS "${GUILE_DEPENDS}"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-qif-import-2
     SOURCES "${qif_import_SCHEME_2}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "${GUILE_DEPENDS};scm-qif-import")
+    DEPENDS "${GUILE_DEPENDS};scm-qif-import"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-qif-import
     SOURCES "${qif_import_SCHEME}"
@@ -93,11 +95,13 @@ gnc_add_scheme_targets(scm-qif-import
 gnc_add_scheme_deprecated_module (
     OLD_MODULE "gnucash import-export qif-import"
     NEW_MODULE "gnucash qif-import"
-    DEPENDS "scm-qif-import-2")
+    DEPENDS "scm-qif-import-2"
+    MAKE_LINKS)
 gnc_add_scheme_deprecated_module (
     OLD_MODULE "gnucash import-export string"
     NEW_MODULE "gnucash string"
-    DEPENDS "scm-qif-import-0")
+    DEPENDS "scm-qif-import-0"
+    MAKE_LINKS)
 
 set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
         ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 70012b4f8..39c12d694 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -193,12 +193,14 @@ gnc_add_scheme_targets(scm-app-utils-1
   gnc_add_scheme_targets(scm-bus-prefs
     SOURCES "business-prefs.scm"
     OUTPUT_DIR "gnucash/app-utils"
-    DEPENDS "scm-app-utils-1")
+    DEPENDS "scm-app-utils-1"
+    MAKE_LINKS)
 
 gnc_add_scheme_targets(scm-app-utils-2
     SOURCES "${app_utils_SCHEME_2}"
     OUTPUT_DIR "gnucash"
-    DEPENDS "scm-bus-prefs")
+    DEPENDS "scm-bus-prefs"
+    MAKE_LINKS)
 
 # Module interfaces deprecated in 4.x, will be removed for 5.x
 gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs")

commit e6c77d404ed9d79311030f26e4fa85b15b1e5008
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 13 16:49:27 2020 -0800

    Revert bumping version in CMakeLists.txt. Not quite time.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72a30ab04..78da42ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
 endif()
 
 project (gnucash
-    VERSION 4.3
+    VERSION 4.2
 )
 
 enable_testing()

commit d86b30b6282fcdca9e0501d85e695c4270eb8ccd
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 13 16:45:18 2020 -0800

    Force scheme to make links before any builds.
    
    The new modules regime can only find files in the final modules
    layout, so interdependent files can be built only if they're linked
    first or have a strict dependency order provided to cmake. In many
    cases the latter is impractical.

diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 9a4b0e961..225147f1d 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -174,6 +174,7 @@ function(gnc_add_scheme_targets _TARGET)
   endif()
 
   # If links are requested, we simply link (or copy, for Windows) each source file to the dest directory
+  set(TARGET_LINKS "")
   if(SCHEME_TGT_MAKE_LINKS)
     set(_LINK_DIR ${CMAKE_BINARY_DIR}/${GUILE_REL_UNIX_SITEDIR}/${SCHEME_TGT_OUTPUT_DIR})
     file(MAKE_DIRECTORY ${_LINK_DIR})
@@ -193,7 +194,8 @@ function(gnc_add_scheme_targets _TARGET)
         )
       endif()
     endforeach(scheme_file)
-    add_custom_target(${_TARGET}-links ALL DEPENDS ${_SCHEME_LINKS})
+    set(TARGET_LINKS ${_TARGET}-links)
+    add_custom_target(${TARGET_LINKS} ALL DEPENDS ${_SCHEME_LINKS})
   endif()
 
   # Construct the guile source and compiled load paths
@@ -279,7 +281,7 @@ function(gnc_add_scheme_targets _TARGET)
   if (__DEBUG)
     message("TARGET_FILES are ${_TARGET_FILES}")
   endif()
-  add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
+  add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES} ${TARGET_LINKS})
 
   set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
 



Summary of changes:
 CMakeLists.txt                                 |  2 +-
 common/cmake_modules/GncAddSchemeTargets.cmake |  6 ++++--
 gnucash/import-export/qif-imp/CMakeLists.txt   | 12 ++++++++----
 libgnucash/app-utils/CMakeLists.txt            |  6 ++++--
 4 files changed, 17 insertions(+), 9 deletions(-)



More information about the gnucash-changes mailing list