---- OpenCV-2.1.0/CMakeLists.txt~ 2010-08-13 12:44:23.367365865 +0200
-+++ OpenCV-2.1.0/CMakeLists.txt 2010-08-13 12:47:51.710667315 +0200
-@@ -708,6 +708,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
+ 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)
+- add_extra_compiler_option(-march=i686)
+- endif()
+-
+ if(APPLE)
+ add_extra_compiler_option(-Wno-semicolon-before-method-body)
+ endif()