diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-27 18:13:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 18:13:59 (GMT) |
| commit | 2e68926a9d4929e9289373cd49e40ddcb9a628f7 (patch) | |
| tree | a5825772e31b5b67c484da238f5935664b4864c4 | |
| parent | 641e7a3752d451d3ea246d1dd1528f6315b87fcf (diff) | |
| parent | ebb2fca51a2b868132992d273bb97696bff969b3 (diff) | |
| download | googletest-2e68926a9d4929e9289373cd49e40ddcb9a628f7.zip googletest-2e68926a9d4929e9289373cd49e40ddcb9a628f7.tar.gz googletest-2e68926a9d4929e9289373cd49e40ddcb9a628f7.tar.bz2 | |
Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock
Use `$<INSTALL_PREFIX>` in `target_include_directories`
| -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) |