mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Respect the environment LD_LIBRARY_PATH for loading Scheme modules and tests.
This commit is contained in:
parent
5cabbbc998
commit
1e59819176
@ -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)
|
||||||
|
@ -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 "")
|
||||||
|
Loading…
Reference in New Issue
Block a user