aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/cmake
diff options
context:
space:
mode:
authorStefano Soffia <stefano.soffia.it@gmail.com>2018-01-25 21:21:54 +0100
committerStefano Soffia <stefano.soffia.it@gmail.com>2018-01-25 23:19:57 +0100
commitb8ac390a577e22353885fd48de62c47e714768a4 (patch)
treeb53da8b97a2f8206404ebfdba968b8ce17c6efcb /googletest/cmake
parentb3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff)
downloadgoogletest-b8ac390a577e22353885fd48de62c47e714768a4.tar.gz
googletest-b8ac390a577e22353885fd48de62c47e714768a4.tar.bz2
googletest-b8ac390a577e22353885fd48de62c47e714768a4.zip
Fix test build issue with GCC7.2.
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 c54bc94f..2c978332 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