- rel 2.1, bootstrap for vtk 7.1

[packages/opencv.git] / opencv-cflags.patch

diff --git a/opencv-cflags.patch b/opencv-cflags.patch
index 288c41b83be423c529fe15b0d8b45e1ebcc4de8d..1ae421505a66eaa26363892d7901b80cb63a062e 100644 (file)
--- a/opencv-cflags.patch
+++ b/opencv-cflags.patch
@@ -1,22 +1,22 @@
---- OpenCV-2.3.1/CMakeLists.txt.orig   2011-09-20 11:49:54.179110367 +0200
-+++ OpenCV-2.3.1/CMakeLists.txt        2011-09-20 11:50:58.153269555 +0200
-@@ -1135,6 +1135,8 @@
- set(EXTRA_EXE_LINKER_FLAGS_RELEASE "")
- set(EXTRA_EXE_LINKER_FLAGS_DEBUG "")
+--- opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake~   2015-05-19 11:39:16.000000000 +0300
++++ opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake    2015-05-19 11:47:57.851517663 +0300
+@@ -47,6 +47,8 @@
+   endif()
+ endmacro()
  
-+set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -D__STDC_CONSTANT_MACROS")
++add_extra_compiler_option(-D__STDC_CONSTANT_MACROS)
 +
- if(MSVC)
-     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
-     # 64-bit portability warnings, in MSVC8
-@@ -1174,10 +1176,6 @@
-         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")
-     endif()
+ if(MINGW)
+   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40838
+   # here we are trying to workaround the problem
+@@ -110,10 +110,6 @@
+     add_extra_compiler_option(-Werror)
+   endif()
  
--    if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
--        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
--    endif()
+-  if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
+-    add_extra_compiler_option(-march=i686)
+-  endif()
 -
-     # Other optimizations
-     if(USE_OMIT_FRAME_POINTER)
-         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer")
+   if(APPLE)
+     add_extra_compiler_option(-Wno-semicolon-before-method-body)
+   endif()