[Bf-blender-cvs] [bbfb074155e] master: Fix macOS tests failures with new libraries on buildbot

Brecht Van Lommel noreply at git.blender.org
Wed Dec 7 19:56:57 CET 2022


Commit: bbfb074155e5e366729715609d0b4cab583191b6
Author: Brecht Van Lommel
Date:   Wed Dec 7 19:33:54 2022 +0100
Branches: master
https://developer.blender.org/rBbbfb074155e5e366729715609d0b4cab583191b6

Fix macOS tests failures with new libraries on buildbot

Don't assume a trailing slash in the install path.

===================================================================

M	build_files/cmake/platform/platform_apple.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index f7351f482bb..81545612176 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -496,7 +496,7 @@ if(PLATFORM_BUNDLED_LIBRARIES)
   # Environment variables to run precompiled executables that needed libraries.
   list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ":" _library_paths)
   set(PLATFORM_ENV_BUILD "DYLD_LIBRARY_PATH=\"${_library_paths};${DYLD_LIBRARY_PATH}\"")
-  set(PLATFORM_ENV_INSTALL "DYLD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}Blender.app/Contents/Resources/lib/;$DYLD_LIBRARY_PATH")
+  set(PLATFORM_ENV_INSTALL "DYLD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/Blender.app/Contents/Resources/lib/;$DYLD_LIBRARY_PATH")
   unset(_library_paths)
 endif()



More information about the Bf-blender-cvs mailing list