Merge pull request #8210 from alalek:fix_mkl_link

This commit is contained in:
Alexander Alekhin
2017-02-16 08:56:02 +00:00
2 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -1,7 +1,6 @@
set(the_description "The Core Functionality")
ocv_add_module(core
"${OPENCV_HAL_LINKER_LIBS}"
PRIVATE_REQUIRED ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}"
OPTIONAL opencv_cudev
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_create_module(${extra_libs})
ocv_target_link_libraries(${the_module} ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}")
ocv_add_accuracy_tests()
ocv_add_perf_tests()