summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorBilly Donahue <BillyDonahue@users.noreply.github.com>2016-12-18 16:59:12 (GMT)
committerGitHub <noreply@github.com>2016-12-18 16:59:12 (GMT)
commit5e7fd50e17b6edf1cadff973d0ec68966cf3265e (patch)
tree0a66a13ac8da76af5eaf5c63215a84386761ddfc /googlemock
parentc0059a79f82d0ecc3e9bfdc12146a5b84befc70a (diff)
parentcb502b7ad15c9dc9d1f74087a9fc7b6d12177b9b (diff)
downloadgoogletest-5e7fd50e17b6edf1cadff973d0ec68966cf3265e.zip
googletest-5e7fd50e17b6edf1cadff973d0ec68966cf3265e.tar.gz
googletest-5e7fd50e17b6edf1cadff973d0ec68966cf3265e.tar.bz2
Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time
Added docs for ExternalProject download during CMake step
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/README.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/googlemock/README.md b/googlemock/README.md
index 332beab..ed500c8 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"