commit 2e68926a9d4929e9289373cd49e40ddcb9a628f7
author Gennadiy Civil <gennadiycivil@users.noreply.github.com> Mon Aug 27 14:13:59 2018 -0400
committer GitHub <noreply@github.com> Mon Aug 27 14:13:59 2018 -0400
tree a5825772e31b5b67c484da238f5935664b4864c4
parent 641e7a3752d451d3ea246d1dd1528f6315b87fcf
parent ebb2fca51a2b868132992d273bb97696bff969b3

Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock

Use `$<INSTALL_PREFIX>` in `target_include_directories`

googlemock/CMakeLists.txt

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 @@
 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()
 
 ########################################################################

googletest/CMakeLists.txt

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 @@
 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)