IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Respect the environment LD_LIBRARY_PATH for loading Scheme modules and tests.

Browse Source
This commit is contained in:
John Ralls 2020-04-29 17:11:52 -07:00
parent 5cabbbc998
commit 1e59819176
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/cmake_modules/GncAddSchemeTargets.cmake
View File

@ -121,10 +121,10 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
file(TO_CMAKE_PATH "$ENV{PATH}" fpath) file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
set(LIBRARY_PATH "PATH=${BINDIR_BUILD};${fpath}") set(LIBRARY_PATH "PATH=${BINDIR_BUILD};${fpath}")
else() 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() endif()
if (APPLE) 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() endif()
set(_GNC_MODULE_PATH "") set(_GNC_MODULE_PATH "")
if(MINGW64) if(MINGW64)

4
common/cmake_modules/GncAddTest.cmake
View File

@ -9,10 +9,10 @@ function(get_guile_env)
list(APPEND env "GNC_UNINSTALLED=yes") list(APPEND env "GNC_UNINSTALLED=yes")
list(APPEND env "GNC_BUILDDIR=${CMAKE_BINARY_DIR}") list(APPEND env "GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
if (APPLE) 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() endif()
if (UNIX) 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() endif()
if (MINGW64) if (MINGW64)
set(fpath "") set(fpath "")