Skip to content

O
opencv
Commit 7e99911c authored by Vladislav Sovrasov's avatar Vladislav Sovrasov
Browse files
Options

Fix MKL x86 detection on Windows

parent ec5038f2
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cmake/OpenCVFindMKL.cmake
View file @ 7e99911c
...@@ -79,12 +79,13 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8) ...@@ -79,12 +79,13 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR EQUAL 8)
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)
set(MKL_LP64 "lp64") set(MKL_ARCH_SUFFIX "lp64")
else() else()
set(MKL_LP64 "ilp64") set(MKL_ARCH_SUFFIX "ilp64")
endif() endif()
else() else()
set(MKL_ARCH "ia32") set(MKL_ARCH "ia32")
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")
...@@ -94,7 +95,7 @@ if(${MKL_VERSION_STR} VERSION_GREATER "11.3.0" OR ${MKL_VERSION_STR} VERSION_EQU ...@@ -94,7 +95,7 @@ if(${MKL_VERSION_STR} VERSION_GREATER "11.3.0" OR ${MKL_VERSION_STR} VERSION_EQU
set(mkl_lib_list set(mkl_lib_list
mkl_core mkl_core
mkl_intel_${MKL_LP64}) 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)
...@@ -112,7 +113,6 @@ else() ...@@ -112,7 +113,6 @@ else()
mkl_fail() mkl_fail()
endif() 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} ${lib} ${mkl_lib_find_paths})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment