aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/README.md
diff options
context:
space:
mode:
authorCraig Scott <audiofanatic@gmail.com>2015-12-08 00:14:24 +1100
committerCraig Scott <craig.scott@crascit.com>2016-12-18 09:01:27 +1100
commitcb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b (patch)
tree610bd049518f03af4f1442f939ff7c368dba332d /googlemock/README.md
parenta2b8a8e07628e5fd60644b6dd99c1b5e7d7f1f47 (diff)
downloadgoogletest-cb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b.tar.gz
googletest-cb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b.tar.bz2
googletest-cb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b.zip
Added CMake configure-time download instructions to docs
Adds instructions for how to add gtest and gmock to another CMake project directly. Downloading of the googletest sources happens as configure time, allowing it to be added to the main build directly via the add_subdirectory() command. This ensures googletest is built with the same compiler settings, etc. and will typically result in a more robust and more convenient build arrangement.
Diffstat (limited to 'googlemock/README.md')
-rw-r--r--googlemock/README.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/googlemock/README.md b/googlemock/README.md
index 332beab3..ed500c8a 100644
--- a/googlemock/README.md
+++ b/googlemock/README.md
@@ -125,6 +125,14 @@ build Google Mock and its tests, which has further requirements:
### Building Google Mock ###
+If you have CMake available, it is recommended that you follow the
+[build instructions][gtest_cmakebuild]
+as described for Google Test. If are using Google Mock with an
+existing CMake project, the section
+[Incorporating Into An Existing CMake Project][gtest_incorpcmake]
+may be of particular interest. Otherwise, the following sections
+detail how to build Google Mock without CMake.
+
#### Preparing to Build (Unix only) ####
If you are using a Unix system and plan to use the GNU Autotools build
@@ -331,3 +339,5 @@ patch.
Happy testing!
[gtest_readme]: ../googletest/README.md "googletest"
+[gtest_cmakebuild]: ../googletest/README.md#using-cmake "Using CMake"
+[gtest_incorpcmake]: ../googletest/README.md#incorporating-into-an-existing-cmake-project "Incorporating Into An Existing CMake Project"