diff options
| author | Copybara-Service <copybara-worker@google.com> | 2023-05-22 19:41:47 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-05-22 19:41:47 (GMT) |
| commit | 45804691223635953f311cf31a10c632553bbfc3 (patch) | |
| tree | 71d12b849d82270cc7b4c8463cddccd0b4a99bea | |
| parent | cb455a71fb23303e37ce8ee5b1cde6a2c18f66a5 (diff) | |
| parent | aa99ce5a0db4215bb8e2cda3ee68b6b8d4896815 (diff) | |
| download | googletest-45804691223635953f311cf31a10c632553bbfc3.zip googletest-45804691223635953f311cf31a10c632553bbfc3.tar.gz googletest-45804691223635953f311cf31a10c632553bbfc3.tar.bz2 | |
Merge pull request #4250 from shlomnissan:cmake-quickstart-update
PiperOrigin-RevId: 534150776
Change-Id: Ib6c07c6abd06c259494928102e2cb800b6652612
| -rw-r--r-- | docs/quickstart-cmake.md | 1 | ||||
| -rw-r--r-- | googletest/README.md | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/quickstart-cmake.md b/docs/quickstart-cmake.md index 5abe504..4e422b7 100644 --- a/docs/quickstart-cmake.md +++ b/docs/quickstart-cmake.md @@ -54,6 +54,7 @@ project(my_project) # GoogleTest requires at least C++14 set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) include(FetchContent) FetchContent_Declare( diff --git a/googletest/README.md b/googletest/README.md index 995834e..4cad12f 100644 --- a/googletest/README.md +++ b/googletest/README.md @@ -126,10 +126,10 @@ match the project in which it is included. An environment that supports C++11 is required in order to successfully build GoogleTest. One way to ensure this is to specify the standard in the top-level -project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command. If this -is not feasible, for example in a C project using GoogleTest for validation, -then it can be specified by adding it to the options for cmake via the -`DCMAKE_CXX_FLAGS` option. +project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command along +with `set(CMAKE_CXX_STANDARD_REQUIRED ON). If this is not feasible, for example +in a C project using GoogleTest for validation, then it can be specified by +adding it to the options for cmake via the`-DCMAKE_CXX_FLAGS` option. ### Tweaking GoogleTest |