blender/cycles
8
16
Fork 11
Code Issues 3 Pull Requests 5 Releases Activity

Fix for successfully reading external library environment variables #7

Open
Alex Fuller wants to merge 1 commits from boberfly/cycles:fixes/libraryPaths into main
pull from: boberfly/cycles:fixes/libraryPaths
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 1 Files Changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmake/external_libs.cmake
View File

@ -915,7 +915,7 @@ if(WIN32)
set(PLATFORM_LIB_INSTALL_DIR ".") set(PLATFORM_LIB_INSTALL_DIR ".")
# Environment variables to run precompiled executables that needed libraries. # Environment variables to run precompiled executables that needed libraries.
list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS "\;" _library_paths) list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS "\;" _library_paths)
set(PLATFORM_ENV_BUILD_DIRS "${_library_paths}\;${PATH}") set(PLATFORM_ENV_BUILD_DIRS "${_library_paths}\;$ENV{PATH}")
set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}") set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}")
unset(_library_paths) unset(_library_paths)
elseif(APPLE) elseif(APPLE)
@ -930,7 +930,7 @@ elseif(APPLE)
# Environment variables to run precompiled executables that needed libraries. # Environment variables to run precompiled executables that needed libraries.
list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths) list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
set(PLATFORM_ENV_BUILD "DYLD_LIBRARY_PATH=\"${_library_paths};${DYLD_LIBRARY_PATH}\"") set(PLATFORM_ENV_BUILD "DYLD_LIBRARY_PATH=\"${_library_paths};$ENV{DYLD_LIBRARY_PATH}\"")
unset(_library_paths) unset(_library_paths)
elseif(UNIX) elseif(UNIX)
set(PLATFORM_LIB_INSTALL_DIR "lib") set(PLATFORM_LIB_INSTALL_DIR "lib")
@ -944,6 +944,6 @@ elseif(UNIX)
# Environment variables to run precompiled executables that needed libraries. # Environment variables to run precompiled executables that needed libraries.
list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths) list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
set(PLATFORM_ENV_BUILD "LD_LIBRARY_PATH=\"${_library_paths}:${LD_LIBRARY_PATH}\"") set(PLATFORM_ENV_BUILD "LD_LIBRARY_PATH=\"${_library_paths}:$ENV{LD_LIBRARY_PATH}\"")
unset(_library_paths) unset(_library_paths)
endif() endif()