Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-10-23 06:50:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-23 06:50:42 +0300
commit4dc443908c109689960590949235c875a1771d90 (patch)
tree3b36c27ef66657b7397ad7cfd1d56d152c7d76e7 /build_files
parent15d27c1ae53adc7d768fc6ca13073e74fbb36ee4 (diff)
CMake: disable OpenMP on macOS bpy_module config
This gives linking errors on build.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/config/bpy_module.cmake15
1 files changed, 13 insertions, 2 deletions
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()