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

cmake: fix LAPACK/MKL detection

Browse Source
This commit is contained in:
Alexander Alekhin 2017-10-13 15:40:37 +03:00
parent 1ba29cc95d
commit 23f26fb4a8
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/OpenCVFindLAPACK.cmake
View File

@ -121,7 +121,8 @@ if(WITH_LAPACK)
set(LAPACK_IMPL "LAPACK/MKL") set(LAPACK_IMPL "LAPACK/MKL")
ocv_lapack_check() ocv_lapack_check()
endif() endif()
if(LAPACKE_INCLUDE_DIR AND NOT HAVE_LAPACK) if(NOT HAVE_LAPACK)
if(LAPACKE_INCLUDE_DIR)
set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR})
set(LAPACK_CBLAS_H "cblas.h") set(LAPACK_CBLAS_H "cblas.h")
set(LAPACK_LAPACKE_H "lapacke.h") set(LAPACK_LAPACKE_H "lapacke.h")
@ -132,12 +133,10 @@ if(WITH_LAPACK)
set(LAPACK_LAPACKE_H "Accelerate/Accelerate.h") set(LAPACK_LAPACKE_H "Accelerate/Accelerate.h")
set(LAPACK_IMPL "LAPACK/Apple") set(LAPACK_IMPL "LAPACK/Apple")
ocv_lapack_check() ocv_lapack_check()
else()
unset(LAPACK_LIBRARIES)
unset(LAPACK_LIBRARIES CACHE)
endif() endif()
else() endif()
# LAPACK not found endif()
if(NOT HAVE_LAPACK)
unset(LAPACK_LIBRARIES) unset(LAPACK_LIBRARIES)
unset(LAPACK_LIBRARIES CACHE) unset(LAPACK_LIBRARIES CACHE)
endif() endif()