diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-12-10 17:28:00 -0500 |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-12-10 17:28:00 -0500 |
| commit | 0162ff72e80e50e06264081d6e278a5af5d5228a (patch) | |
| tree | a1b88ef0e480b40bc1afd33bb64b2bec55568aa9 | |
| parent | c1cd9c2b05d5acff704e4b831c01d2905efb0c1f (diff) | |
| parent | f601ee162e23eb3fe49446d13ccd6d30ca687218 (diff) | |
| download | googletest-0162ff72e80e50e06264081d6e278a5af5d5228a.tar.gz | |
Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps
Add include dirs to targets if CMake version supports it
| -rw-r--r-- | googlemock/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 7f330c5e..beb259a2 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -92,6 +92,14 @@ cxx_library(gmock_main src/gmock-all.cc src/gmock_main.cc) +# If the CMake version supports it, attach header directory information +# 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") +endif() + ######################################################################## # # Install rules diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 9ef6a93f..621d0f04 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -91,6 +91,14 @@ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) target_link_libraries(gtest_main gtest) +# If the CMake version supports it, attach header directory information +# 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") +endif() + ######################################################################## # # Install rules |