Skip to content
Snippets Groups Projects
Commit 22cb35b2 authored by Adrien Crovato's avatar Adrien Crovato
Browse files

Retry patch

parent 721dacaa
No related branches found
No related tags found
1 merge request!67v2.2.1 - Update windows build and TBB
Pipeline #3918 passed with warnings
...@@ -137,14 +137,6 @@ def initDLL(): ...@@ -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): def initMKL(nthreads):
import os import os
# we try to have full control over the threading environment # we try to have full control over the threading environment
......
...@@ -25,6 +25,9 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src) ...@@ -25,6 +25,9 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src)
FIND_PACKAGE(TBB REQUIRED) FIND_PACKAGE(TBB REQUIRED)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TBB_CXX_FLAGS_DEBUG}") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TBB_CXX_FLAGS_DEBUG}")
TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${TBB_INCLUDE_DIRS}) 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}) TARGET_LINK_LIBRARIES(tbox ${TBB_LIBRARIES})
# -- MKL/BLAS/LAPACK -- # -- MKL/BLAS/LAPACK --
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment