Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
bb8be523
Commit
bb8be523
authored
Feb 16, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8210 from alalek:fix_mkl_link
parents
236815ec
05248a3d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
OpenCVFindMKL.cmake
cmake/OpenCVFindMKL.cmake
+3
-3
CMakeLists.txt
modules/core/CMakeLists.txt
+2
-1
No files found.
cmake/OpenCVFindMKL.cmake
View file @
bb8be523
...
...
@@ -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_ARCH
}
${
MKL_ROOT_DIR
}
/../tbb/lib/
${
MKL_ARCH
}
)
set
(
mkl_lib_list
mkl_core
mkl_intel_
${
MKL_ARCH_SUFFIX
}
)
set
(
mkl_lib_list
"mkl_intel_
${
MKL_ARCH_SUFFIX
}
"
)
if
(
MKL_WITH_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
()
list
(
APPEND mkl_lib_list mkl_sequential
)
endif
()
list
(
APPEND mkl_lib_list mkl_core
)
else
()
message
(
STATUS
"MKL version
${
MKL_VERSION_STR
}
is not supported"
)
mkl_fail
()
...
...
modules/core/CMakeLists.txt
View file @
bb8be523
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
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment