Merge pull request #114 from cmumford:werror-only-clang
PiperOrigin-RevId: 347660305
This commit is contained in:
@@ -66,10 +66,12 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
|||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
|
||||||
endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
|
endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
|
||||||
|
|
||||||
# Use -Werror for clang and gcc.
|
# Use -Werror for clang only.
|
||||||
|
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||||
endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
|
||||||
|
endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
|
||||||
# Disable C++ exceptions.
|
# Disable C++ exceptions.
|
||||||
string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
|||||||
1
third_party/benchmark
vendored
1
third_party/benchmark
vendored
Submodule third_party/benchmark deleted from bf585a2789
1
third_party/googletest
vendored
1
third_party/googletest
vendored
Submodule third_party/googletest deleted from 18f8200e30
Reference in New Issue
Block a user