]>
Commit | Line | Data |
---|---|---|
a4b83c36 ER |
1 | --- opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake~ 2015-05-19 11:39:16.000000000 +0300 |
2 | +++ opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake 2015-05-19 11:47:57.851517663 +0300 | |
b60c12b0 MK |
3 | @@ -47,6 +47,8 @@ |
4 | endif() | |
5 | endmacro() | |
b94dd30c | 6 | |
b60c12b0 | 7 | +add_extra_compiler_option(-D__STDC_CONSTANT_MACROS) |
b94dd30c | 8 | + |
b60c12b0 MK |
9 | if(MINGW) |
10 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40838 | |
11 | # here we are trying to workaround the problem | |
a4b83c36 | 12 | @@ -110,10 +110,6 @@ |
b60c12b0 MK |
13 | add_extra_compiler_option(-Werror) |
14 | endif() | |
8b9f61f7 | 15 | |
b60c12b0 MK |
16 | - if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE) |
17 | - add_extra_compiler_option(-march=i686) | |
18 | - endif() | |
8b9f61f7 | 19 | - |
a4b83c36 ER |
20 | if(APPLE) |
21 | add_extra_compiler_option(-Wno-semicolon-before-method-body) | |
22 | endif() |