From efe88b279020922738d1f54b39aaa30329394279 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 24 Feb 2016 12:52:31 -0500 Subject: [PATCH] Windows: cmake: Disable VS2010 override warning (issue #1642) --- CMakeLists.txt.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index 54d6c2d1d..8630f1072 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -333,7 +333,7 @@ if(OS_MACOSX) # -O3 = Optimize for maximum speed plus a few extras set(CEF_COMPILER_FLAGS_RELEASE "-O3") # -Wl,-search_paths_first = Search for static or shared library versions in the same pass - # -Wl,-ObjC = Support creation of creation of ObjC static libraries + # -Wl,-ObjC = Support creation of creation of ObjC static libraries # -Wl,-pie = Generate position-independent code suitable for executables only set(CEF_LINKER_FLAGS "-Wl,-search_paths_first -Wl,-ObjC -Wl,-pie") # -Wl,-dead_strip = Strip dead code @@ -392,11 +392,12 @@ if(OS_WINDOWS) # /wd"4100" = Ignore "unreferenced formal parameter" warning # /wd"4127" = Ignore "conditional expression is constant" warning # /wd"4244" = Ignore "conversion possible loss of data" warning + # /wd"4481" = Ignore "nonstandard extension used: override" warning # /wd"4512" = Ignore "assignment operator could not be generated" warning # /wd"4701" = Ignore "potentially uninitialized local variable" warning # /wd"4702" = Ignore "unreachable code" warning # /wd"4996" = Ignore "function or variable may be unsafe" warning - set(CEF_COMPILER_FLAGS "/MP /Gy /GR- /W4 /WX /wd\"4100\" /wd\"4127\" /wd\"4244\" /wd\"4512\" /wd\"4701\" /wd\"4702\" /wd\"4996\" ${CEF_DEBUG_INFO_FLAG}") + set(CEF_COMPILER_FLAGS "/MP /Gy /GR- /W4 /WX /wd\"4100\" /wd\"4127\" /wd\"4244\" /wd\"4481\" /wd\"4512\" /wd\"4701\" /wd\"4702\" /wd\"4996\" ${CEF_DEBUG_INFO_FLAG}") # /MTd = Multithreaded debug runtime # /Od = Disable optimizations # /RTC1 = Enable basic run-time checks