From 17d8245bdfaf75cc156aaf382b54782068a0c0f7 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 29 Apr 2017 16:04:13 +0200 Subject: cmake/msvc: don't force sse2 for all projects In particular OpenCV now branches on extensions at runtime. --- cmake/msvc.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 823bfffe..3a86aa28 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 /Gy") +set(cc "/O2it /Ob2 /fp:fast /GS- /GF /GL /Gw /Gy") set(warns_ "") @@ -41,10 +41,10 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack") foreach(i ${warns-noerr}) set(warns_ "${warns_} /w1${i}") endforeach() - set(cc "${cc} /GR-") + set(cc "${cc} /GR- /arch:SSE2") endif() -set(silly "${warns_} /MT /Zi /Gm") +set(silly "${warns_} /MT /Zi /Gm -source-charset:UTF-8") set(_CFLAGS "${silly}") set(_CXXFLAGS "${silly}") -- cgit v1.2.3