core(lapack): fix build issues related to 'extern "C"'

pull/10677/head
Alexander Alekhin 7 years ago
parent b97b650ab3
commit 81c5fae56f
  1. 2
      cmake/OpenCVFindLAPACK.cmake
  2. 1
      cmake/checks/lapack_check.cpp
  3. 1
      modules/core/src/hal_internal.cpp

@ -31,7 +31,7 @@ macro(ocv_lapack_check)
else() else()
# adding proxy opencv_lapack.h header # adding proxy opencv_lapack.h header
set(CBLAS_H_PROXY_PATH ${CMAKE_BINARY_DIR}/opencv_lapack.h) set(CBLAS_H_PROXY_PATH ${CMAKE_BINARY_DIR}/opencv_lapack.h)
if(APPLE) if((APPLE OR OPENCV_SKIP_LAPACK_EXTERN_C) AND NOT OPENCV_FORCE_LAPACK_EXTERN_C)
set(_lapack_include_str_extern_C "") set(_lapack_include_str_extern_C "")
set(_lapack_include_str_extern_C_end "") set(_lapack_include_str_extern_C_end "")
else() else()

@ -1,3 +1,4 @@
#include <complex.h>
#include "opencv_lapack.h" #include "opencv_lapack.h"
static char* check_fn1 = (char*)sgesv_; static char* check_fn1 = (char*)sgesv_;

@ -46,6 +46,7 @@
#ifdef HAVE_LAPACK #ifdef HAVE_LAPACK
#include <complex.h>
#include "opencv_lapack.h" #include "opencv_lapack.h"
#include <cmath> #include <cmath>

Loading…
Cancel
Save