]>
Commit | Line | Data |
---|---|---|
d8f32a84 | 1 | --- OpenCV-2.3.1/CMakeLists.txt.orig 2011-09-20 11:49:54.179110367 +0200 |
2 | +++ OpenCV-2.3.1/CMakeLists.txt 2011-09-20 11:50:58.153269555 +0200 | |
3 | @@ -1135,6 +1135,8 @@ | |
b94dd30c | 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 | |
d8f32a84 | 12 | @@ -1174,10 +1176,6 @@ |
8b9f61f7 JB |
13 | set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") |
14 | endif() | |
15 | ||
d8f32a84 | 16 | - if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE) |
17 | - set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686") | |
8b9f61f7 JB |
18 | - endif() |
19 | - | |
20 | # Other optimizations | |
21 | if(USE_OMIT_FRAME_POINTER) | |
22 | set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") |