diff options
| author | Falk David <falkdavid@gmx.de> | 2020-09-12 13:17:47 +0300 |
|---|---|---|
| committer | Falk David <falkdavid@gmx.de> | 2020-09-12 13:17:47 +0300 |
| commit | c00523aca49d7e6d3aadf1e4a230ae8fb67044cc (patch) | |
| tree | 5e5cb8fd566b75726241a20bf229f989e6f46367 /build_files/cmake/config/bpy_module.cmake | |
| parent | 8156e948042a464ca40ca78c946874340a8421f4 (diff) | |
| parent | 269ceb666b01b8cddbfb5babddf38546a41eba39 (diff) | |
Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curvesoc-2020-greasepencil-curve
Diffstat (limited to 'build_files/cmake/config/bpy_module.cmake')
| -rw-r--r-- | build_files/cmake/config/bpy_module.cmake | 15 |
1 files changed, 3 insertions, 12 deletions
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) |