gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4250 from shlomnissan:cmake-quickstart-update

Browse Source 
PiperOrigin-RevId: 534150776
Change-Id: Ib6c07c6abd06c259494928102e2cb800b6652612
This commit is contained in:
Copybara-Service
2023-05-22 12:41:47 -07:00
parent cb455a71fb aa99ce5a0d
commit 4580469122
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/quickstart-cmake.md
View File

@@ -54,6 +54,7 @@ project(my_project)
# GoogleTest requires at least C++14 # GoogleTest requires at least C++14
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(FetchContent) include(FetchContent)
FetchContent_Declare( FetchContent_Declare(

8
googletest/README.md
View File

@@ -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 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 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 project, for example by using the `set(CMAKE_CXX_STANDARD 11)` command along
is not feasible, for example in a C project using GoogleTest for validation, with `set(CMAKE_CXX_STANDARD_REQUIRED ON). If this is not feasible, for example
then it can be specified by adding it to the options for cmake via the in a C project using GoogleTest for validation, then it can be specified by
`DCMAKE_CXX_FLAGS` option. adding it to the options for cmake via the`-DCMAKE_CXX_FLAGS` option.
### Tweaking GoogleTest ### Tweaking GoogleTest