From 4dc443908c109689960590949235c875a1771d90 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Oct 2019 14:50:42 +1100 Subject: CMake: disable OpenMP on macOS bpy_module config This gives linking errors on build. --- build_files/cmake/config/bpy_module.cmake | 15 +++++++++++++-- 1 file 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() -- cgit v1.2.3