diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-28 23:37:31 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-28 23:37:31 +0200 |
| commit | f3d16459b19098ec4c1269a527867270c19c9e98 (patch) | |
| tree | 17e71bad078e1ebe30b4ee8dc270a6a9d44762a2 /cmake | |
| parent | 8cfd801a3b96acdcf9a91ceeda04471ad7dd5c75 (diff) | |
cmake/msvc: fix using toolchain file for opencv from git
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 991f6797..191e3c0c 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -12,7 +12,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # oldest CPU supported here is Northwood-based Pentium 4. -sh 20150811 -set(cc "/O2it /Ob2 /arch:SSE2 /fp:fast /GS- /GF /GL /Gw /GR- /Gy") +set(cc "/O2it /Ob2 /arch:SSE2 /fp:fast /GS- /GF /GL /Gw /Gy") set(warns_ "") @@ -40,6 +40,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack") foreach(i ${warns-noerr}) set(warns_ "${warns_} /w1${i}") endforeach() + set(cc "${cc} /GR-") endif() set(silly "${warns_} /MT /Zi /Gm") @@ -47,7 +48,7 @@ set(silly "${warns_} /MT /Zi /Gm") set(_CFLAGS "${silly}") set(_CXXFLAGS "${silly}") set(_CFLAGS_RELEASE "${cc}") -set(_CFLAGS_DEBUG "/GS /sdl /Gs /guard:cf /RTCsu -D_ITERATOR_DEBUG_LEVEL=0 -D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0") +set(_CFLAGS_DEBUG "/GS /sdl /Gs /guard:cf -D_ITERATOR_DEBUG_LEVEL=0 -D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0") set(_CXXFLAGS_RELEASE "${cc}") set(_CXXFLAGS_DEBUG "${_CFLAGS_DEBUG}") |