From b833d512eca239627e6c933a96f63009b5103edc Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 5 Dec 2017 15:45:37 +0300 Subject: [PATCH] fixed native Lapack detection script on Mac/iOS (where native Lapack is a part of Accelerate framework) --- cmake/OpenCVFindLAPACK.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake index f5fce67..f4f9415 100644 --- a/cmake/OpenCVFindLAPACK.cmake +++ b/cmake/OpenCVFindLAPACK.cmake @@ -31,11 +31,18 @@ macro(ocv_lapack_check) else() # adding proxy opencv_lapack.h header set(CBLAS_H_PROXY_PATH ${CMAKE_BINARY_DIR}/opencv_lapack.h) - set(_lapack_include_str "extern \"C\" {\n\#include \"${OPENCV_CBLAS_H_PATH_${_lapack_impl}}\"") + if(APPLE) + set(_lapack_include_str_extern_C "") + set(_lapack_include_str_extern_C_end "") + else() + set(_lapack_include_str_extern_C "extern \"C\" {\n") + set(_lapack_include_str_extern_C_end "}\n") + endif() + set(_lapack_include_str "${_lapack_include_str_extern_C}\#include \"${OPENCV_CBLAS_H_PATH_${_lapack_impl}}\"") if(NOT "${OPENCV_CBLAS_H_PATH_${_lapack_impl}}" STREQUAL "${OPENCV_LAPACKE_H_PATH_${_lapack_impl}}") set(_lapack_include_str "${_lapack_include_str}\n#include \"${OPENCV_LAPACKE_H_PATH_${_lapack_impl}}\"") endif() - set(_lapack_include_str "${_lapack_include_str}\n}\n") + set(_lapack_include_str "${_lapack_include_str}\n${_lapack_include_str_extern_C_end}") # update file contents (if required) set(__content_str "") if(EXISTS "${CBLAS_H_PROXY_PATH}") -- 2.7.4