From b19292e6b64263992cd049154015a6ef359473ef Mon Sep 17 00:00:00 2001 From: Dakota Hawkins Date: Thu, 23 Aug 2018 01:42:34 -0400 Subject: Use `$` in `target_include_directories` To make sure packages are relocatable, use `$` in `$` `target_include_directories`. `$` 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 --- googlemock/CMakeLists.txt | 4 ++-- 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 "$" - $) + "$/${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gmock_main SYSTEM INTERFACE "$" - $) + "$/${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 "$" - $) + "$/${CMAKE_INSTALL_INCLUDEDIR}>") target_include_directories(gtest_main SYSTEM INTERFACE "$" - $) + "$/${CMAKE_INSTALL_INCLUDEDIR}>") endif() target_link_libraries(gtest_main PUBLIC gtest) -- cgit v0.12