mirror of
https://github.com/google/snappy.git
synced 2024-11-28 05:44:33 +00:00
Merge pull request #114 from cmumford:werror-only-clang
PiperOrigin-RevId: 347660305
This commit is contained in:
commit
6badb0a261
|
@ -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
|
@ -1 +0,0 @@
|
||||||
Subproject commit bf585a2789e30585b4e3ce6baf11ef2750b54677
|
|
1
third_party/googletest
vendored
1
third_party/googletest
vendored
|
@ -1 +0,0 @@
|
||||||
Subproject commit 18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6
|
|
Loading…
Reference in a new issue