diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:58:17 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:58:17 (GMT) |
| commit | 92c93802e13e84f4d916f45dd99417cdeb38841b (patch) | |
| tree | 2a2f28e60798824956dc46fb7c89e1e35ee2a8de | |
| parent | fbb48a7708fc791ef25096b383791966bbf369f0 (diff) | |
| parent | cb7271697bca56802db773f1b9a92fdaed5b7eee (diff) | |
| download | googletest-92c93802e13e84f4d916f45dd99417cdeb38841b.zip googletest-92c93802e13e84f4d916f45dd99417cdeb38841b.tar.gz googletest-92c93802e13e84f4d916f45dd99417cdeb38841b.tar.bz2 | |
Merge branch 'master' of https://github.com/google/googletestrefs/pull/1429/head
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 3 | ||||
| -rw-r--r-- | googletest/docs/Documentation.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index c54bc94..2c97833 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 diff --git a/googletest/docs/Documentation.md b/googletest/docs/Documentation.md index 3784c8f..20f2503 100644 --- a/googletest/docs/Documentation.md +++ b/googletest/docs/Documentation.md @@ -12,5 +12,5 @@ the respective git branch/tag).** To contribute code to Google Test, read: - * [CONTRIBUTING](../CONTRIBUTING.md) -- read this _before_ writing your first patch. + * [CONTRIBUTING](../../CONTRIBUTING.md) -- read this _before_ writing your first patch. * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files. |