From 07d7028dd0d47d54d21c54ae5eaf872e60e1bc4b Mon Sep 17 00:00:00 2001 From: Tyler Alden Gubala Date: Thu, 10 Sep 2020 14:54:21 +0200 Subject: CMake: various fixes for building Python module * Don't link against Mesa OpenGL software emulation libraries from the lib folder, they are not intended to be used for building, only install. * Don't use static OpenMP library by default, it's usually not built to work in shared libraries. * Disable jemalloc on all platforms, the reason it fails is not specific to Linux. Differential Revision: https://developer.blender.org/D8827 --- build_files/cmake/config/bpy_module.cmake | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'build_files/cmake/config') diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake index 18d19b32335..2c0da81a1ea 100644 --- a/build_files/cmake/config/bpy_module.cmake +++ b/build_files/cmake/config/bpy_module.cmake @@ -33,18 +33,9 @@ set(WITH_ALEMBIC OFF CACHE BOOL "" FORCE) # 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() +# Jemalloc does not work with dlopen() of Python modules: +# https://github.com/jemalloc/jemalloc/issues/1237 +set(WITH_MEM_JEMALLOC OFF CACHE BOOL "" FORCE) if(WIN32) set(WITH_WINDOWS_BUNDLE_CRT OFF CACHE BOOL "" FORCE) -- cgit v1.2.3