mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8210 from alalek:fix_mkl_link

Browse Source
This commit is contained in:
Alexander Alekhin 2017-02-16 08:56:02 +00:00
commit bb8be523c5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVFindMKL.cmake
View File

@ -96,9 +96,7 @@ if(${MKL_VERSION_STR} VERSION_GREATER "11.3.0" OR ${MKL_VERSION_STR} VERSION_EQU
${MKL_ROOT_DIR}/lib ${MKL_ROOT_DIR}/lib
${MKL_ROOT_DIR}/lib/${MKL_ARCH} ${MKL_ROOT_DIR}/../tbb/lib/${MKL_ARCH}) ${MKL_ROOT_DIR}/lib/${MKL_ARCH} ${MKL_ROOT_DIR}/../tbb/lib/${MKL_ARCH})
set(mkl_lib_list set(mkl_lib_list "mkl_intel_${MKL_ARCH_SUFFIX}")
mkl_core
mkl_intel_${MKL_ARCH_SUFFIX})
if(MKL_WITH_TBB) if(MKL_WITH_TBB)
list(APPEND mkl_lib_list mkl_tbb_thread tbb) list(APPEND mkl_lib_list mkl_tbb_thread tbb)
@ -111,6 +109,8 @@ if(${MKL_VERSION_STR} VERSION_GREATER "11.3.0" OR ${MKL_VERSION_STR} VERSION_EQU
else() else()
list(APPEND mkl_lib_list mkl_sequential) list(APPEND mkl_lib_list mkl_sequential)
endif() endif()
list(APPEND mkl_lib_list mkl_core)
else() else()
message(STATUS "MKL version ${MKL_VERSION_STR} is not supported") message(STATUS "MKL version ${MKL_VERSION_STR} is not supported")
mkl_fail() mkl_fail()

3
modules/core/CMakeLists.txt
View File

@ -1,7 +1,6 @@
set(the_description "The Core Functionality") set(the_description "The Core Functionality")
ocv_add_module(core ocv_add_module(core
"${OPENCV_HAL_LINKER_LIBS}" "${OPENCV_HAL_LINKER_LIBS}"
PRIVATE_REQUIRED ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}"
OPTIONAL opencv_cudev OPTIONAL opencv_cudev
WRAP java python) WRAP java python)
@ -33,5 +32,7 @@ ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version
ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS}) ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS})
ocv_create_module(${extra_libs}) ocv_create_module(${extra_libs})
ocv_target_link_libraries(${the_module} ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}")
ocv_add_accuracy_tests() ocv_add_accuracy_tests()
ocv_add_perf_tests() ocv_add_perf_tests()