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

Merge branch 'maint'

Browse Source
This commit is contained in:
Christopher Lam
2020-05-04 23:31:21 +08:00
parent e5e7b30f7a 2fae14c3ba
commit 14ea5d9751
12 changed files with 40 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/cmake_modules/GncAddSchemeTargets.cmake
View File

@@ -237,10 +237,10 @@ function(gnc_add_scheme_targets _TARGET)
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)

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_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 "")