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

improve the mkl search procedure

Browse Source
This commit is contained in:
cyy 2020-02-29 18:59:43 +08:00 committed by Alexander Alekhin
parent 0c8da03869
commit db3e3be8ee
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/OpenCVFindMKL.cmake
View File

@ -79,9 +79,10 @@ get_mkl_version(${MKL_INCLUDE_DIRS}/mkl_version.h)
#determine arch #determine arch
if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8) if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(MKL_X64 1) set(MKL_ARCH_LIST "intel64")
set(MKL_ARCH "intel64") if(MSVC)
list(APPEND MKL_ARCH_LIST "win-x64")
endif()
include(CheckTypeSize) include(CheckTypeSize)
CHECK_TYPE_SIZE(int _sizeof_int) CHECK_TYPE_SIZE(int _sizeof_int)
if (_sizeof_int EQUAL 4) if (_sizeof_int EQUAL 4)
@ -90,14 +91,19 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
set(MKL_ARCH_SUFFIX "ilp64") set(MKL_ARCH_SUFFIX "ilp64")
endif() endif()
else() else()
set(MKL_ARCH "ia32") set(MKL_ARCH_LIST "ia32")
set(MKL_ARCH_SUFFIX "c") set(MKL_ARCH_SUFFIX "c")
endif() endif()
if(MKL_VERSION_STR VERSION_GREATER "11.3.0" OR MKL_VERSION_STR VERSION_EQUAL "11.3.0") if(MKL_VERSION_STR VERSION_GREATER "11.3.0" OR MKL_VERSION_STR VERSION_EQUAL "11.3.0")
set(mkl_lib_find_paths set(mkl_lib_find_paths
${MKL_ROOT_DIR}/lib ${MKL_ROOT_DIR}/lib)
${MKL_ROOT_DIR}/lib/${MKL_ARCH} ${MKL_ROOT_DIR}/../tbb/lib/${MKL_ARCH}) foreach(MKL_ARCH ${MKL_ARCH_LIST})
list(APPEND mkl_lib_find_paths
${MKL_ROOT_DIR}/lib/${MKL_ARCH}
${MKL_ROOT_DIR}/../tbb/lib/${MKL_ARCH}
${MKL_ROOT_DIR}/${MKL_ARCH})
endforeach()
set(mkl_lib_list "mkl_intel_${MKL_ARCH_SUFFIX}") set(mkl_lib_list "mkl_intel_${MKL_ARCH_SUFFIX}")
@ -121,7 +127,7 @@ endif()
set(MKL_LIBRARIES "") set(MKL_LIBRARIES "")
foreach(lib ${mkl_lib_list}) foreach(lib ${mkl_lib_list})
find_library(${lib} ${lib} ${mkl_lib_find_paths}) find_library(${lib} NAMES ${lib} ${lib}_dll HINTS ${mkl_lib_find_paths})
mark_as_advanced(${lib}) mark_as_advanced(${lib})
if(NOT ${lib}) if(NOT ${lib})
mkl_fail() mkl_fail()