Skip to content

Commit 46b2da4

Browse files
committed
MKL-TBB: removed tbb from dependencies list
1 parent 694fe3e commit 46b2da4

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

cmake/OpenCVFindMKL.cmake

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,10 @@ if(MKL_USE_SINGLE_DYNAMIC_LIBRARY AND NOT (MKL_VERSION_STR VERSION_LESS "10.3.0"
118118

119119
elseif(NOT (MKL_VERSION_STR VERSION_LESS "11.3.0"))
120120

121-
foreach(MKL_ARCH ${MKL_ARCH_LIST})
122-
list(APPEND mkl_lib_find_paths
123-
${MKL_ROOT_DIR}/../tbb/lib/${MKL_ARCH}
124-
)
125-
endforeach()
126-
127121
set(mkl_lib_list "mkl_intel_${MKL_ARCH_SUFFIX}")
128122

129123
if(MKL_WITH_TBB)
130-
list(APPEND mkl_lib_list mkl_tbb_thread tbb)
124+
list(APPEND mkl_lib_list mkl_tbb_thread)
131125
elseif(MKL_WITH_OPENMP)
132126
if(MSVC)
133127
list(APPEND mkl_lib_list mkl_intel_thread libiomp5md)
@@ -155,6 +149,7 @@ if(NOT MKL_LIBRARIES)
155149
endif()
156150
list(APPEND MKL_LIBRARIES ${${lib_var_name}})
157151
endforeach()
152+
list(APPEND MKL_LIBRARIES ${OPENCV_EXTRA_MKL_LIBRARIES})
158153
endif()
159154

160155
message(STATUS "Found MKL ${MKL_VERSION_STR} at: ${MKL_ROOT_DIR}")

0 commit comments

Comments
 (0)