]>
Commit | Line | Data |
---|---|---|
b94dd30c | 1 | --- OpenCV-2.1.0/CMakeLists.txt~ 2010-08-13 12:44:23.367365865 +0200 |
2 | +++ OpenCV-2.1.0/CMakeLists.txt 2010-08-13 12:47:51.710667315 +0200 | |
3 | @@ -708,6 +708,8 @@ | |
4 | set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") | |
5 | set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") | |
6 | ||
7 | +set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -D__STDC_CONSTANT_MACROS") | |
8 | + | |
9 | if(MSVC) | |
10 | set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS") | |
11 | # 64-bit portability warnings, in MSVC8 | |
8b9f61f7 JB |
12 | @@ -916,16 +918,6 @@ |
13 | set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") | |
14 | endif() | |
15 | ||
16 | - if(X86) | |
17 | - if(NOT MINGW64) | |
18 | - if(NOT X86_64) | |
19 | - if(NOT APPLE) | |
20 | - set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686") | |
21 | - endif() | |
22 | - endif() | |
23 | - endif() | |
24 | - endif() | |
25 | - | |
26 | # Other optimizations | |
27 | if(USE_OMIT_FRAME_POINTER) | |
28 | set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") |