- release 5

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

diff --git a/opencv-cflags.patch b/opencv-cflags.patch
index 804d1045f4a309fd6e18077edc9a4918884a2a94..288c41b83be423c529fe15b0d8b45e1ebcc4de8d 100644 (file)
--- a/opencv-cflags.patch
+++ b/opencv-cflags.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 "")
  
@@ -9,3 +9,14 @@
  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(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
+-        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
+-    endif()
+-
+     # Other optimizations
+     if(USE_OMIT_FRAME_POINTER)
+         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer")