From b83ee724a418bee98f4e81e0c6854d03bc2e1fa6 Mon Sep 17 00:00:00 2001 From: Ankit Meel Date: Tue, 10 Aug 2021 10:30:55 +0530 Subject: Fix T90418: macOS codesign fails with dylib next to executable Change the dylib folder relative to `Blender` executable to be the same as before rB652fbc200500497a67bd11d18b786587ba34e3d9 and same as bpy.so : `@loader_path/../Resources/${BLENDER_VERSION}/lib` --- build_files/cmake/platform/platform_apple.cmake | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'build_files/cmake') diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a130d265dff..dceafb236de 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -500,17 +500,10 @@ endif() # makesdna, tests, etc.), we add an rpath to the OpenMP library dir through # CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary. # -# For the installed Blender executable, CMAKE_INSTALL_RPATH will be used -# to locate the dylibs at @executable_path, next to the Blender executable. -# -# For the installed Python module, CMAKE_INSTALL_RPATH is modified to find the -# dylib in an adjacent folder. +# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH +# is modified to find the dylib in an adjacent folder. Install step puts the libraries there. set(CMAKE_SKIP_BUILD_RPATH FALSE) list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}") set(CMAKE_SKIP_INSTALL_RPATH FALSE) -list(APPEND CMAKE_INSTALL_RPATH "@executable_path") - -if(WITH_PYTHON_MODULE) - list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib") -endif() +list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib") -- cgit v1.2.3