third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restored OpenBLAS detection; fixed MKL's lapack header (#7921)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2016-12-23 15:40:51 +03:00
committed by GitHub
parent d0f883524e
commit 0bd68671bd
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindLAPACK.cmake
+11 -11
View File
@@ -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)