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

7 years ago · 81c5fae56f
parent b97b650ab3
commit 81c5fae56f
3 changed files with 3 additions and 1 deletions
--- a/cmake/OpenCVFindLAPACK.cmake
+++ b/cmake/OpenCVFindLAPACK.cmake
@ -31,7 +31,7 @@ macro(ocv_lapack_check)
  else()
    # adding proxy opencv_lapack.h header
    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_end "")
    else()
--- a/cmake/checks/lapack_check.cpp
+++ b/cmake/checks/lapack_check.cpp
@ -1,3 +1,4 @@
+#include <complex.h>
 #include "opencv_lapack.h"

 static char* check_fn1 = (char*)sgesv_;
--- a/modules/core/src/hal_internal.cpp
+++ b/modules/core/src/hal_internal.cpp
@ -46,6 +46,7 @@

 #ifdef HAVE_LAPACK

+#include <complex.h>
 #include "opencv_lapack.h"

 #include <cmath>