diff options
| author | Sam Roth <s-roth@onu.edu> | 2017-01-23 13:49:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 13:49:32 -0500 |
| commit | 3134af23d713a1f85cb122b30353ebdefa2bdccc (patch) | |
| tree | 9f161324a4ea595247300ac5ad4bfa7fc2bcc4ae /googlemock | |
| parent | 32b4a9b39079ca4bf4ff539246302652d86e777f (diff) | |
| parent | 5e7fd50e17b6edf1cadff973d0ec68966cf3265e (diff) | |
| download | googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.tar.gz googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.tar.bz2 googletest-3134af23d713a1f85cb122b30353ebdefa2bdccc.zip | |
Merge pull request #1 from google/master
Syncing my branch
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | googlemock/README.md | 10 | ||||
| -rw-r--r-- | googlemock/docs/CookBook.md | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index beb259a2..9fb96a4b 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -38,7 +38,7 @@ endif() # ${gmock_BINARY_DIR}. # Language "C" is required for find_package(Threads). project(gmock CXX C) -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.4) if (COMMAND set_up_hermetic_build) set_up_hermetic_build() diff --git a/googlemock/README.md b/googlemock/README.md index 191df69f..3eb10cbb 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" diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md index c52f1009..0460d357 100644 --- a/googlemock/docs/CookBook.md +++ b/googlemock/docs/CookBook.md @@ -218,7 +218,7 @@ per-function syntactic overhead will be much lower. If you are concerned about the performance overhead incurred by virtual functions, and profiling confirms your concern, you can -combine this with the recipe for [mocking non-virtual methods](#Mocking_Nonvirtual_Methods.md). +combine this with the recipe for [mocking non-virtual methods](#mocking-nonvirtual-methods). ## The Nice, the Strict, and the Naggy ## |