Skip to content

GitLab

Commit 14bd3629 authored by peastman's avatar peastman
Browse files

Merge pull request #1090 from rmcgibbo/cmake-windows 

Eliminate extra warning about overriding the warning level
parents 7ee7de16 0ea62d4f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
CMakeLists.txt
View file @ 14bd3629
...@@ -120,10 +120,9 @@ IF (APPLE AND (NOT PNACL)) ...@@ -120,10 +120,9 @@ IF (APPLE AND (NOT PNACL))
SET(EXTRA_COMPILE_FLAGS "-msse2 -stdlib=libc++") SET(EXTRA_COMPILE_FLAGS "-msse2 -stdlib=libc++")
ELSE (APPLE AND (NOT PNACL)) ELSE (APPLE AND (NOT PNACL))
IF (MSVC OR ANDROID OR PNACL) IF (MSVC OR ANDROID OR PNACL)
SET(EXTRA_COMPILE_FLAGS)
IF (MSVC) 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) ENDIF (MSVC)
ELSE (MSVC OR ANDROID OR PNACL) ELSE (MSVC OR ANDROID OR PNACL)
SET(EXTRA_COMPILE_FLAGS "-msse2") SET(EXTRA_COMPILE_FLAGS "-msse2")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment