diff options
author | bryanzim <BryanZim@bazinnovations.com> | 2017-12-11 09:37:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-11 09:37:55 -0500 |
commit | f98c20baa82aad40c3295f3a8c052d079a5081ea (patch) | |
tree | 565da1547a2f3c8385e1549e5a64a3d8cdb78863 | |
parent | d6a4478caf10f5cfcfe477e576f4a290d9a49b24 (diff) | |
parent | 59202300f1a774068608caff0351cc084fe79e7c (diff) | |
download | googletest-f98c20baa82aad40c3295f3a8c052d079a5081ea.tar.gz googletest-f98c20baa82aad40c3295f3a8c052d079a5081ea.tar.bz2 googletest-f98c20baa82aad40c3295f3a8c052d079a5081ea.zip |
Merge branch 'master' into master
-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 58ffd44d..cc90378e 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -104,8 +104,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 00922222..cb2cbaed 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -106,8 +106,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() ######################################################################## |