From 08aa7c67dd85f0184a7d531d3b22b78fccf55afe Mon Sep 17 00:00:00 2001 From: Will Vining Date: Fri, 24 Aug 2018 12:52:32 -0600 Subject: [PATCH] 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. --- googlemock/README.md | 21 --------------------- 1 file changed, 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) ####