diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-12 13:20:26 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-12 13:20:27 -0500 |
| commit | b68ec344bfe4af3a0d84e28ab1d74dacfb5e2ae4 (patch) | |
| tree | f05f2876d5e850e479ce77b1134b315317fef4f7 | |
| parent | 4f79e316acc9cd05ca20272e05e19585dae5f7b0 (diff) | |
| parent | f89253434fd3f61db4014ca56cff3253e8ff5978 (diff) | |
| download | googletest-b68ec344bfe4af3a0d84e28ab1d74dacfb5e2ae4.tar.gz | |
Merge pull request #2101 from MaEtUgR:fix-cmake-cygwin
PiperOrigin-RevId: 233096223
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | googletest/docs/advanced.md | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be14229e..afe79593 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,22 @@ cmake_minimum_required(VERSION 2.8.8) +project(googletest-distribution) +set(GOOGLETEST_VERSION 1.9.0) + if (CMAKE_VERSION VERSION_LESS "3.1") add_definitions(-std=c++11) else() set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) + if(NOT CYGWIN) + set(CMAKE_CXX_EXTENSIONS OFF) + endif() endif() if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) endif (POLICY CMP0048) -project(googletest-distribution) -set(GOOGLETEST_VERSION 1.9.0) - enable_testing() include(CMakeDependentOption) @@ -56,7 +56,6 @@ Google test has been used on a variety of platforms: * MinGW * Windows Mobile * Symbian - * PlatformIO ## Who Is Using Google Test? ## diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index ea9b80fc..acb7f240 100644 --- a/googletest/docs/advanced.md +++ b/googletest/docs/advanced.md @@ -2430,7 +2430,7 @@ could generate this report: "failures": 1, "errors": 0, "time": "0.035s", - "timestamp": "2011-10-31T18:52:42Z", + "timestamp": "2011-10-31T18:52:42Z" "name": "AllTests", "testsuites": [ { @@ -2447,11 +2447,11 @@ could generate this report: "classname": "", "failures": [ { - "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2", + "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2", "type": "" }, { - "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0", + "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", "type": "" } ] @@ -2463,7 +2463,7 @@ could generate this report: "classname": "" } ] - }, + } { "name": "LogicTest", "tests": 1, @@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when running the tests. **Availability**: Linux, Windows, Mac. + |