File tree Expand file tree Collapse file tree 1 file changed +2
-7
lines changed Expand file tree Collapse file tree 1 file changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -118,16 +118,10 @@ if(MKL_USE_SINGLE_DYNAMIC_LIBRARY AND NOT (MKL_VERSION_STR VERSION_LESS "10.3.0"
118
118
119
119
elseif (NOT (MKL_VERSION_STR VERSION_LESS "11.3.0" ))
120
120
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
-
127
121
set (mkl_lib_list "mkl_intel_${MKL_ARCH_SUFFIX} " )
128
122
129
123
if (MKL_WITH_TBB )
130
- list (APPEND mkl_lib_list mkl_tbb_thread tbb )
124
+ list (APPEND mkl_lib_list mkl_tbb_thread )
131
125
elseif (MKL_WITH_OPENMP )
132
126
if (MSVC )
133
127
list (APPEND mkl_lib_list mkl_intel_thread libiomp5md )
@@ -155,6 +149,7 @@ if(NOT MKL_LIBRARIES)
155
149
endif ()
156
150
list (APPEND MKL_LIBRARIES ${${lib_var_name}} )
157
151
endforeach ()
152
+ list (APPEND MKL_LIBRARIES ${OPENCV_EXTRA_MKL_LIBRARIES} )
158
153
endif ()
159
154
160
155
message (STATUS "Found MKL ${MKL_VERSION_STR} at: ${MKL_ROOT_DIR} " )
You can’t perform that action at this time.
0 commit comments