gnucash maint: Replace VERSION_GREATER_EQUAL with VERSION_GREATER OR VERSION_EQUAL.

John Ralls jralls at code.gnucash.org
Mon Apr 22 15:12:20 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/3815e17e (commit)
	from  https://github.com/Gnucash/gnucash/commit/79f4536a (commit)



commit 3815e17e9f2db7fbd7031b9118885d8567e60ad9
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 22 12:12:03 2019 -0700

    Replace VERSION_GREATER_EQUAL with VERSION_GREATER OR VERSION_EQUAL.
    
    The former wasn't introduced until Cmake 3.7.

diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 9426cfc50..da0706dfa 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -81,7 +81,9 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
   set(_GUILE_LOAD_PATH "${current_srcdir}"
       "${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm")  # to pick up generated build-config.scm
   set(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
-  if(MINGW64 AND ${GUILE_EFFECTIVE_VERSION} VERSION_GREATER_EQUAL 2.2)
+  # VERSION_GREATER_EQUAL introduced in CMake 3.7.
+  if(MINGW64 AND (${GUILE_EFFECTIVE_VERSION} VERSION_GREATER 2.2 OR
+	${GUILE_EFFECTIVE_VERSION} VERSION_EQUAL 2.2))
     file(TO_CMAKE_PATH $ENV{GUILE_LOAD_PATH} guile_load_path)
     file(TO_CMAKE_PATH $ENV{GUILE_LOAD_COMPILED_PATH} guile_load_compiled_path)
     list(APPEND _GUILE_LOAD_PATH ${guile_load_path})



Summary of changes:
 common/cmake_modules/GncAddSchemeTargets.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)



More information about the gnucash-changes mailing list