diff options
| author | Dakota Hawkins <dakotahawkins@gmail.com> | 2018-08-23 05:42:34 (GMT) |
|---|---|---|
| committer | Dakota Hawkins <dakotahawkins@gmail.com> | 2018-08-24 20:51:55 (GMT) |
| commit | b19292e6b64263992cd049154015a6ef359473ef (patch) | |
| tree | ad8e7aae5bf6fd8b2e9f868768a3ad798b46a723 | |
| parent | 9c96f500a39df6915f8f1ab53b60be9889f1572b (diff) | |
| download | googletest-b19292e6b64263992cd049154015a6ef359473ef.zip googletest-b19292e6b64263992cd049154015a6ef359473ef.tar.gz googletest-b19292e6b64263992cd049154015a6ef359473ef.tar.bz2 | |
Use `$<INSTALL_PREFIX>` in `target_include_directories`
To make sure packages are relocatable, use `$<INSTALL_PREFIX>` in
`$<INSTALL_INTERFACE:...>` `target_include_directories`.
`$<INSTALL_PREFIX>` was introduced in CMake 2.8.11, which is already
being checked for locally.
References:
- https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#id19
- https://github.com/robotology/how-to-export-cpp-library/blob/claudio/headeronly/src/LibTemplateCMake/CMakeLists.txt#L42
Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
| -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 195d254..8a8de1f 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -118,10 +118,10 @@ endif() if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") target_include_directories(gmock SYSTEM INTERFACE "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gmock_main SYSTEM INTERFACE "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") endif() ######################################################################## diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index 2ac9aa0..9ee7940 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -138,10 +138,10 @@ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") target_include_directories(gtest SYSTEM INTERFACE "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gtest_main SYSTEM INTERFACE "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") endif() target_link_libraries(gtest_main PUBLIC gtest) |