diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-26 10:48:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 10:48:44 -0500 |
| commit | aa82c6f14b723a11c272b9450f387699fe679745 (patch) | |
| tree | b53da8b97a2f8206404ebfdba968b8ce17c6efcb | |
| parent | b3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff) | |
| parent | b8ac390a577e22353885fd48de62c47e714768a4 (diff) | |
| download | googletest-aa82c6f14b723a11c272b9450f387699fe679745.tar.gz googletest-aa82c6f14b723a11c272b9450f387699fe679745.tar.bz2 googletest-aa82c6f14b723a11c272b9450f387699fe679745.zip | |
Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0
Fix test build issue with GCC7.2 (with -Wno-error=)
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 3 |
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 |