Retry patch

fwk/wutils.py

@@ -137,14 +137,6 @@ def initDLL():
 
 # ------------------------------------------------------------------------------
 
-def initTBB():
-    # For TBB <= 2019.4, needed to include global_control
-    # @todo to be removed
-    import os
-    os.environ['TBB_PREVIEW_GLOBAL_CONTROL'] = 'TRUE'
-
-#-------------------------------------------------------------------------------
-
 def initMKL(nthreads):
     import os
     # we try to have full control over the threading environment

tbox/src/CMakeLists.txt

@@ -25,6 +25,9 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src)
 FIND_PACKAGE(TBB REQUIRED)
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TBB_CXX_FLAGS_DEBUG}")
 TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${TBB_INCLUDE_DIRS})
+IF(TBB_VERSION_INTERFACE LESS 11004)
+    TARGET_COMPILE_DEFINITIONS(tbox PUBLIC TBB_PREVIEW_GLOBAL_CONTROL)
+ENDIF()
 TARGET_LINK_LIBRARIES(tbox  ${TBB_LIBRARIES})
 
 # -- MKL/BLAS/LAPACK --