diff options
| author | Will Vining <wfvining@gmail.com> | 2018-08-24 12:52:32 -0600 |
|---|---|---|
| committer | Will Vining <wfvining@gmail.com> | 2018-08-24 12:52:32 -0600 |
| commit | 08aa7c67dd85f0184a7d531d3b22b78fccf55afe (patch) | |
| tree | d3d28f7026e57d38729682e9551698a7799d0dbb | |
| parent | c3d9db428a7f403185b936a709abfe58b1f3c0d6 (diff) | |
| download | googletest-08aa7c67dd85f0184a7d531d3b22b78fccf55afe.tar.gz googletest-08aa7c67dd85f0184a7d531d3b22b78fccf55afe.tar.bz2 googletest-08aa7c67dd85f0184a7d531d3b22b78fccf55afe.zip | |
Fix #1764 Remove cmake code that leads to a configuration error
This step is no longer necessary. The configuration given in the
googletest README.md is sufficient to bring in all the googlemock
headers.
| -rw-r--r-- | googlemock/README.md | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/googlemock/README.md b/googlemock/README.md index ad374dea..be4758ae 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -144,27 +144,6 @@ to target_link_libraries(example gmock_main) This works because `gmock_main` library is compiled with Google Test. -However, it does not automatically add Google Test includes. -Therefore you will also have to change - - if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include") - endif() - -to - - if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories(BEFORE SYSTEM - "${gtest_SOURCE_DIR}/include" "${gmock_SOURCE_DIR}/include") - else() - target_include_directories(gmock_main SYSTEM BEFORE INTERFACE - "${gtest_SOURCE_DIR}/include" "${gmock_SOURCE_DIR}/include") - endif() - -This will addtionally mark Google Mock includes as system, which will -silence compiler warnings when compiling your tests using clang with -`-Wpedantic -Wall -Wextra -Wconversion`. - #### Preparing to Build (Unix only) #### |