[Bf-blender-cvs] [68ae8f70c82] tmp_openmpfix: List contents of MacOS folder, and get otool output.

Ankit Meel noreply at git.blender.org
Tue Aug 3 21:07:17 CEST 2021


Commit: 68ae8f70c82c9651f9a7dda680dda737dcaaf3fa
Author: Ankit Meel
Date:   Wed Aug 4 00:37:09 2021 +0530
Branches: tmp_openmpfix
https://developer.blender.org/rB68ae8f70c82c9651f9a7dda680dda737dcaaf3fa

List contents of MacOS folder, and get otool output.

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

M	build_files/cmake/platform/platform_apple.cmake
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 93b45f09a31..c18b2225f97 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -507,7 +507,7 @@ endif()
 # dylib in an adjacent folder.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 if(WITH_OPENMP)
-  list(APPEND CMAKE_BUILD_RPATH   "${OpenMP_LIBRARY_DIR}")
+  list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
 endif()
 
 set(CMAKE_SKIP_INSTALL_RPATH FALSE)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 23a747be521..a07b038e24b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1044,9 +1044,6 @@ elseif(APPLE)
     Blender.app/Contents/
   )
 
-  message(WARNING "OPENMP_CUSTOM=${OPENMP_CUSTOM} WITH_OPENMP=${WITH_OPENMP}")
-  message(WARNING "OpenMP_LIBRARY=${OpenMP_LIBRARY}")
-  message(WARNING "MAC_BLENDER_TARGET_DYLIBS_DIR=${MAC_BLENDER_TARGET_DYLIBS_DIR}")
   if(WITH_OPENMP AND OPENMP_CUSTOM)
     install(
       FILES "${OpenMP_LIBRARY}"
@@ -1060,6 +1057,8 @@ elseif(APPLE)
       DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}"
     )
   endif()
+  install(CODE "execute_process(COMMAND ls \"${MAC_BLENDER_TARGET_DYLIBS_DIR}\")")
+  install(CODE "execute_process(COMMAND otool -l \"$<TARGET_FILE:blender>\")")
 
   # python
   if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)



More information about the Bf-blender-cvs mailing list