diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-13 10:24:59 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-13 10:24:59 -0500 |
| commit | 75c3396099bfd7b82e623115ea9eec169b50b451 (patch) | |
| tree | 1ae7264b115303a17b29c14291f1b14fc5c585fd | |
| parent | c4ccab33aaa0e86741db7c02a1d1040af76bd059 (diff) | |
| parent | 60cf03313da2bf615cbc5c535105afb7aa310431 (diff) | |
| download | googletest-75c3396099bfd7b82e623115ea9eec169b50b451.tar.gz | |
Merge pull request #2113 from knuto:pr/set_old_gtest_ver
PiperOrigin-RevId: 233748252
| -rw-r--r-- | googletest/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/docs/advanced.md | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index e33718b1..6e42c5c6 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -40,8 +40,12 @@ endif() # as ${gtest_SOURCE_DIR} and to the root binary directory as # ${gtest_BINARY_DIR}. # Language "C" is required for find_package(Threads). + +# Project version: + if (CMAKE_VERSION VERSION_LESS 3.0) project(gtest CXX C) + set(PROJECT_VERSION ${GOOGLETEST_VERSION}) else() cmake_policy(SET CMP0048 NEW) project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index acb7f240..ea9b80fc 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)\x0A Actual: 3\x0AExpected: 2", + "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2", "type": "" }, { - "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", + "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0", "type": "" } ] @@ -2463,7 +2463,7 @@ could generate this report: "classname": "" } ] - } + }, { "name": "LogicTest", "tests": 1, @@ -2517,4 +2517,3 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when running the tests. **Availability**: Linux, Windows, Mac. - |