Merge pull request #10386 from richardkchapman/no-roxie-tbb

HPCC-18230 Don't use tbbmalloc in Roxie

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

cmake_modules/commonSetup.cmake

@@ -107,6 +107,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   else()
       option(USE_TBB "Enable Threading Building Block support" ON)
       option(USE_TBBMALLOC "Enable Threading Building Block scalable allocator proxy support" ON)
+      option(USE_TBBMALLOC_ROXIE "Enable Threading Building Block scalable allocator proxy support in Roxie" OFF)
   endif()
   option(LOGGING_SERVICE "Configure use of logging service" ON)
 

roxie/ccd/CMakeLists.txt

@@ -123,7 +123,7 @@ IF (USE_OPENSSL)
     )
 ENDIF()
 
-IF (USE_TBBMALLOC)
+IF (USE_TBBMALLOC AND USE_TBBMALLOC_ROXIE)
    add_dependencies ( ccd tbb )
    target_link_libraries ( ccd libtbbmalloc_proxy libtbbmalloc)
 ENDIF()