summaryrefslogtreecommitdiffstats
path: root/googletest/cmake
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-02-27 15:00:29 (GMT)
committerGitHub <noreply@github.com>2018-02-27 15:00:29 (GMT)
commitd4f77c1e3a340b37f5bed5e1e4de7d741f1d1199 (patch)
treefd25c57276fa42ec365f1ca05b4853ab459697e4 /googletest/cmake
parent3498a1ac52deb83f30b8170c78bfba9dc6227198 (diff)
parentac34e6c950925df7165e626becd3f9d64dcd584b (diff)
downloadgoogletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.zip
googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.gz
googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.bz2
Merge branch 'master' into win-libcxx2refs/pull/1423/head
Diffstat (limited to 'googletest/cmake')
-rw-r--r--googletest/cmake/internal_utils.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index acffe0c..3277cc5 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -95,6 +95,9 @@ macro(config_compiler_and_linker)
set(cxx_no_rtti_flags "-GR-")
elseif (CMAKE_COMPILER_IS_GNUCXX)
set(cxx_base_flags "-Wall -Wshadow -Werror")
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
+ set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else")
+ endif()
set(cxx_exception_flags "-fexceptions")
set(cxx_no_exception_flags "-fno-exceptions")
# Until version 4.3.2, GCC doesn't define a macro to indicate