[Bf-blender-cvs] [4dc443908c1] blender-v2.81-release: CMake: disable OpenMP on macOS bpy_module config
Campbell Barton
noreply at git.blender.org
Wed Oct 23 05:53:26 CEST 2019
Commit: 4dc443908c109689960590949235c875a1771d90
Author: Campbell Barton
Date: Wed Oct 23 14:50:42 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB4dc443908c109689960590949235c875a1771d90
CMake: disable OpenMP on macOS bpy_module config
This gives linking errors on build.
===================================================================
M build_files/cmake/config/bpy_module.cmake
===================================================================
diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake
index 46aee50135c..99bf17475c8 100644
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -31,7 +31,18 @@ set(WITH_BULLET OFF CACHE BOOL "" FORCE)
set(WITH_OPENVDB OFF CACHE BOOL "" FORCE)
set(WITH_ALEMBIC OFF CACHE BOOL "" FORCE)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- # jemalloc causes linking error on import, disable.
+# Depends on Python install, do this to quiet warning.
+set(WITH_DRACO OFF CACHE BOOL "" FORCE)
+
+# Note, if linking errors can be resolved, lines below can be removed.
+# Until then, disable configurations known to fail.
+
+if(UNIX AND NOT APPLE)
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ # jemalloc causes linking error on import, disable.
+ set(WITH_MEM_JEMALLOC OFF CACHE BOOL "" FORCE)
+ endif()
+elseif(APPLE)
+ # OpenMP causes linking error on build, disable.
set(WITH_MEM_JEMALLOC OFF CACHE BOOL "" FORCE)
endif()
More information about the Bf-blender-cvs
mailing list