Merge pull request #1090 from rmcgibbo/cmake-windows

Eliminate extra warning about overriding the warning level

Merge pull request #1090 from rmcgibbo/cmake-windows
Eliminate extra warning about overriding the warning level
14bd3629 · peastman · 7ee7de16 · 0ea62d4f · 14bd3629
Commit 14bd3629 authored Aug 12, 2015 by peastman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +2 -3

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,10 +120,9 @@ IF (APPLE AND (NOT PNACL))
    SET(EXTRA_COMPILE_FLAGS "-msse2 -stdlib=libc++")
 ELSE (APPLE AND (NOT PNACL))
    IF (MSVC OR ANDROID OR PNACL)
+        SET(EXTRA_COMPILE_FLAGS)
        IF (MSVC)
-            SET(EXTRA_COMPILE_FLAGS "/W 2")
+            STRING(REGEX REPLACE "/W[0-4]" "/W2" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ELSE (MSVC)
-            SET(EXTRA_COMPILE_FLAGS)
        ENDIF (MSVC)
    ELSE (MSVC OR ANDROID OR PNACL)
        SET(EXTRA_COMPILE_FLAGS "-msse2")