[ci release] disable malloc override on mac

variar · May 19, 2021 · c09d0cc · c09d0cc
1 parent ffe73be
commit c09d0cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/3rdparty/onetbb/CMakeLists.txt b/3rdparty/onetbb/CMakeLists.txt
@@ -192,9 +192,10 @@ if (TBB_FIND_PACKAGE OR TBB_DIR)
     find_package(TBB REQUIRED)
 else()
     add_subdirectory(src/tbb)
-    add_subdirectory(src/tbbmalloc)
-    add_subdirectory(src/tbbmalloc_proxy)
+
     if (NOT APPLE AND NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips" )
+        add_subdirectory(src/tbbmalloc)
+        add_subdirectory(src/tbbmalloc_proxy)
         if (APPLE)
             message(STATUS "TBBBind build target is disabled due to unsupported environment")
         else()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,12 @@ option(KLOGG_BUILD_TESTS "Build tests" ON)
 option(KLOGG_USE_LTO "Use link time optimization" ON)
 option(KLOGG_USE_SENTRY "Use Sentry" OFF)
 option(KLOGG_GENERIC_CPU "Build for generic CPU" OFF)
+
+if(APPLE)
+option(KLOGG_OVERRIDE_MALLOC "Use malloc global override" OFF)
+else()
 option(KLOGG_OVERRIDE_MALLOC "Use malloc global override" ON)
+endif()
 
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)