Skip to content

GitLab

Unverified Commit f6dadcf1 authored by peter's avatar peter
Browse files

Revert previous changes

parent 96824f11
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
googletest/cmake/internal_utils.cmake
View file @ f6dadcf1
...@@ -98,10 +98,6 @@ macro(config_compiler_and_linker) ...@@ -98,10 +98,6 @@ macro(config_compiler_and_linker)
set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0") set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
set(cxx_no_rtti_flags "-GR-") set(cxx_no_rtti_flags "-GR-")
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
set(cxx_base_flags "${cxx_base_flags} -Wno-unknown-argument")
endif()
elseif (CMAKE_COMPILER_IS_GNUCXX) elseif (CMAKE_COMPILER_IS_GNUCXX)
set(cxx_base_flags "-Wall -Wshadow -Werror") set(cxx_base_flags "-Wall -Wshadow -Werror")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
......
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