Merge pull request #10677 from alalek:issue_10668

0b1f626e · Alexander Alekhin · 7a472d85 · 81c5fae5 · 0b1f626e · 0b1f626e
Commit 0b1f626e authored 7 years ago by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVFindLAPACK.cmake cmake/OpenCVFindLAPACK.cmake +1 -1

lapack_check.cpp cmake/checks/lapack_check.cpp +1 -0

hal_internal.cpp modules/core/src/hal_internal.cpp +1 -0

No files found.
--- 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
+#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>