21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
|
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
|
||
|
|
index 8d8d60a8..58fc9bfb 100644
|
||
|
|
--- a/googletest/cmake/internal_utils.cmake
|
||
|
|
+++ b/googletest/cmake/internal_utils.cmake
|
||
|
|
@@ -84,13 +84,13 @@ macro(config_compiler_and_linker)
|
||
|
|
# Ensure MSVC treats source files as UTF-8 encoded.
|
||
|
|
set(cxx_base_flags "${cxx_base_flags} -utf-8")
|
||
|
|
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||
|
|
- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
|
||
|
|
+ set(cxx_base_flags "-Wall -Wshadow -Wconversion")
|
||
|
|
set(cxx_exception_flags "-fexceptions")
|
||
|
|
set(cxx_no_exception_flags "-fno-exceptions")
|
||
|
|
set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")
|
||
|
|
set(cxx_no_rtti_flags "-fno-rtti")
|
||
|
|
elseif (CMAKE_COMPILER_IS_GNUCXX)
|
||
|
|
- set(cxx_base_flags "-Wall -Wshadow -Werror")
|
||
|
|
+ set(cxx_base_flags "-Wall -Wshadow")
|
||
|
|
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
|
||
|
|
set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
|
||
|
|
endif()
|