[Bf-blender-cvs] [0c10374faf1] master: CMake: disable jemalloc when building as a Python module

Campbell Barton noreply at git.blender.org
Sat Mar 16 03:10:57 CET 2019


Commit: 0c10374faf133083602aa54ded2450feff347a7d
Author: Campbell Barton
Date:   Sat Mar 16 13:05:54 2019 +1100
Branches: master
https://developer.blender.org/rB0c10374faf133083602aa54ded2450feff347a7d

CMake: disable jemalloc when building as a Python module

===================================================================

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 64f7f78a286..1637bbf9506 100644
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -30,3 +30,8 @@ set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 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.
+	set(WITH_MEM_JEMALLOC        OFF CACHE BOOL "" FORCE)
+endif()



More information about the Bf-blender-cvs mailing list