Skip to content

Commit

Permalink
Merge pull request #4250 from shlomnissan:cmake-quickstart-update
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 534150776
Change-Id: Ib6c07c6abd06c259494928102e2cb800b6652612
  • Loading branch information
copybara-github committed May 22, 2023
2 parents cb455a7 + aa99ce5 commit 4580469
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/quickstart-cmake.md
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions googletest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4580469

Please sign in to comment.