diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-11 10:48:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 10:48:12 -0500 |
| commit | ed811dc79feb3325a5ca58ee83732a1318d6c48f (patch) | |
| tree | 49d15e259096d0d8d66428c58d53ea59948717c0 | |
| parent | bc3320b7f1daab522685c67d79b47fd0baddb95c (diff) | |
| parent | 59202300f1a774068608caff0351cc084fe79e7c (diff) | |
| download | googletest-ed811dc79feb3325a5ca58ee83732a1318d6c48f.tar.gz googletest-ed811dc79feb3325a5ca58ee83732a1318d6c48f.tar.bz2 googletest-ed811dc79feb3325a5ca58ee83732a1318d6c48f.zip | |
Merge branch 'master' into blaze-build-travis
| -rw-r--r-- | googlemock/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index c474947e..ead51bf3 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -103,8 +103,8 @@ cxx_library(gmock_main # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gmock INTERFACE "${gmock_SOURCE_DIR}/include") - target_include_directories(gmock_main INTERFACE "${gmock_SOURCE_DIR}/include") + target_include_directories(gmock SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include") + target_include_directories(gmock_main SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include") endif() ######################################################################## diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 31fef2cd..3b907fd7 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -105,8 +105,8 @@ target_link_libraries(gtest_main gtest) # to the targets for when we are part of a parent build (ie being pulled # in via add_subdirectory() rather than being a standalone build). if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest INTERFACE "${gtest_SOURCE_DIR}/include") - target_include_directories(gtest_main INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") + target_include_directories(gtest_main SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include") endif() ######################################################################## |