diff options
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c3aeffe8fda..47fb2642da1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -348,6 +348,7 @@ elseif(APPLE) else() set(TARGETDIR_VER Blender.app/Contents/Resources/${BLENDER_VERSION}) endif() + set(MAC_BLENDER_TARGET_DYLIBS_DIR "${TARGETDIR_VER}/lib") # Skip relinking on cpack / install set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true) endif() @@ -1041,23 +1042,16 @@ elseif(APPLE) if(WITH_OPENMP AND OPENMP_CUSTOM) install( - FILES ${LIBDIR}/openmp/lib/libomp.dylib - DESTINATION Blender.app/Contents/Resources/lib + FILES "${OpenMP_LIBRARY}" + DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}" + ) + endif() + + if(WITH_COMPILER_ASAN) + install( + FILES "${COMPILER_ASAN_LIBRARY}" + DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}" ) - if(WITH_PYTHON_MODULE) - # Move the dylib in a Blender version folder to keep the corresponding OpenMP version. - install( - DIRECTORY ${CMAKE_BINARY_DIR}/Resources/lib - DESTINATION ${TARGETDIR_VER} - ) - add_custom_command(TARGET blender POST_BUILD - # The old `LC_LOAD_DYLIB` is the `LC_ID_DYLIB` of the LIBDIR OpenMP dylib. - # Change it to support multiple rpaths. - COMMAND xcrun install_name_tool -change "@executable_path/../Resources/lib/libomp.dylib" "@rpath/libomp.dylib" "$<TARGET_FILE:blender>" - # For installation into site-packages. - COMMAND xcrun install_name_tool -add_rpath "@loader_path/../Resources/${BLENDER_VERSION}/lib" "$<TARGET_FILE:blender>" - ) - endif() endif() # python |