From 23f26fb4a8b89c1280522a548f0e0658e0903f45 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 13 Oct 2017 15:40:37 +0300 Subject: [PATCH] cmake: fix LAPACK/MKL detection --- cmake/OpenCVFindLAPACK.cmake | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake index e281b4b78c..6a686c6cdc 100644 --- a/cmake/OpenCVFindLAPACK.cmake +++ b/cmake/OpenCVFindLAPACK.cmake @@ -121,23 +121,22 @@ if(WITH_LAPACK) set(LAPACK_IMPL "LAPACK/MKL") ocv_lapack_check() endif() - if(LAPACKE_INCLUDE_DIR AND NOT HAVE_LAPACK) - set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) - set(LAPACK_CBLAS_H "cblas.h") - set(LAPACK_LAPACKE_H "lapacke.h") - set(LAPACK_IMPL "LAPACK/Generic") - ocv_lapack_check() - elseif(APPLE) - set(LAPACK_CBLAS_H "Accelerate/Accelerate.h") - set(LAPACK_LAPACKE_H "Accelerate/Accelerate.h") - set(LAPACK_IMPL "LAPACK/Apple") - ocv_lapack_check() - else() - unset(LAPACK_LIBRARIES) - unset(LAPACK_LIBRARIES CACHE) + if(NOT HAVE_LAPACK) + if(LAPACKE_INCLUDE_DIR) + set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) + set(LAPACK_CBLAS_H "cblas.h") + set(LAPACK_LAPACKE_H "lapacke.h") + set(LAPACK_IMPL "LAPACK/Generic") + ocv_lapack_check() + elseif(APPLE) + set(LAPACK_CBLAS_H "Accelerate/Accelerate.h") + set(LAPACK_LAPACKE_H "Accelerate/Accelerate.h") + set(LAPACK_IMPL "LAPACK/Apple") + ocv_lapack_check() + endif() endif() - else() - # LAPACK not found + endif() + if(NOT HAVE_LAPACK) unset(LAPACK_LIBRARIES) unset(LAPACK_LIBRARIES CACHE) endif()