From 0bd68671bd90b03089aab25924150160aa79c804 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 23 Dec 2016 15:40:51 +0300 Subject: [PATCH] restored OpenBLAS detection; fixed MKL's lapack header (#7921) --- cmake/OpenCVFindLAPACK.cmake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake index 8e6e82f..dfacf24 100644 --- a/cmake/OpenCVFindLAPACK.cmake +++ b/cmake/OpenCVFindLAPACK.cmake @@ -12,20 +12,20 @@ if(WITH_LAPACK) set(LAPACK_INCLUDE_DIR ${MKL_INCLUDE_DIRS}) set(LAPACK_LIBRARIES ${MKL_LIBRARIES} ) set(LAPACK_CBLAS_H "mkl_cblas.h" ) - set(LAPACK_LAPACKE_H "mkl_lapacke.h" ) + set(LAPACK_LAPACKE_H "mkl_lapack.h" ) set(LAPACK_IMPL "MKL") endif() endif() - #if(NOT LAPACK_LIBRARIES) - # include(cmake/OpenCVFindOpenBLAS.cmake) - # if(OpenBLAS_FOUND) - # set(LAPACK_INCLUDE_DIR ${OpenBLAS_INCLUDE_DIR} ) - # set(LAPACK_LIBRARIES ${OpenBLAS_LIB} ) - # set(LAPACK_CBLAS_H "cblas.h" ) - # set(LAPACK_LAPACKE_H "lapacke.h" ) - # set(LAPACK_IMPL "OpenBLAS") - # endif() - #endif() + if(NOT LAPACK_LIBRARIES) + include(cmake/OpenCVFindOpenBLAS.cmake) + if(OpenBLAS_FOUND) + set(LAPACK_INCLUDE_DIR ${OpenBLAS_INCLUDE_DIR} ) + set(LAPACK_LIBRARIES ${OpenBLAS_LIB} ) + set(LAPACK_CBLAS_H "cblas.h" ) + set(LAPACK_LAPACKE_H "lapacke.h" ) + set(LAPACK_IMPL "OpenBLAS") + endif() + endif() if(NOT LAPACK_LIBRARIES AND UNIX) include(cmake/OpenCVFindAtlas.cmake) if(ATLAS_FOUND) -- 2.7.4