gnucash maint: Respect the environment LD_LIBRARY_PATH for loading Scheme modules and tests.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1e598191 (commit)
	from  https://github.com/Gnucash/gnucash/commit/5cabbbc9 (commit)



commit 1e59819176dadee3f1e8e534ed51af37f04e5c55
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Apr 29 17:11:52 2020 -0700

    Respect the environment LD_LIBRARY_PATH for loading Scheme modules and tests.

diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 17336b0a2..be5525c54 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -121,10 +121,10 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
         file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
         set(LIBRARY_PATH "PATH=${BINDIR_BUILD};${fpath}")
       else()
-        set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
+        set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:$ENV{LD_LIBRARY_PATH}")
       endif()
       if (APPLE)
-        set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
+        set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:$ENV{DYLD_LIBRARY_PATH}")
       endif()
       set(_GNC_MODULE_PATH "")
       if(MINGW64)
diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 3d510a4e8..b81d08cf2 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -9,10 +9,10 @@ function(get_guile_env)
   list(APPEND env "GNC_UNINSTALLED=yes")
   list(APPEND env "GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
   if (APPLE)
-    list(APPEND env "DYLD_LIBRARY_PATH=${_GNC_MODULE_PATH}")
+    list(APPEND env "DYLD_LIBRARY_PATH=${_GNC_MODULE_PATH}:$ENV{LD_LIBRARY_PATH}")
   endif()
   if (UNIX)
-    list(APPEND env LD_LIBRARY_PATH=${_GNC_MODULE_PATH})
+    list(APPEND env "LD_LIBRARY_PATH=${_GNC_MODULE_PATH}:$ENV{DYLD_LIBRARY_PATH}")
   endif()
   if (MINGW64)
     set(fpath "")



Summary of changes:
 common/cmake_modules/GncAddSchemeTargets.cmake | 4 ++--
 common/cmake_modules/GncAddTest.cmake          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)