35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
|
|
index 5c1f0daf..ed8aae58 100644
|
|
--- a/googlemock/CMakeLists.txt
|
|
+++ b/googlemock/CMakeLists.txt
|
|
@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
|
string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
|
|
target_include_directories(gmock SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
target_include_directories(gmock_main SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
endif()
|
|
|
|
########################################################################
|
|
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
|
|
index aa00a5f3..50434fed 100644
|
|
--- a/googletest/CMakeLists.txt
|
|
+++ b/googletest/CMakeLists.txt
|
|
@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
|
|
string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
|
|
target_include_directories(gtest SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
target_include_directories(gtest_main SYSTEM INTERFACE
|
|
"$<BUILD_INTERFACE:${dirs}>"
|
|
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
|
endif()
|
|
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
|
|
target_link_libraries(gtest PUBLIC regex)
|