mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
44 lines
1.8 KiB
Plaintext
44 lines
1.8 KiB
Plaintext
From 0c4371e13b0cd8c85b0009c6024d1843d28da385 Mon Sep 17 00:00:00 2001
|
|
From: "Jerome Duval" <jerome.duval@gmail.com>
|
|
Date: Fri, 27 Sep 2024 18:17:12 +0000
|
|
Subject: fix CMake config files
|
|
|
|
|
|
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
|
|
index 99b2411..33ec963 100644
|
|
--- a/googlemock/CMakeLists.txt
|
|
+++ b/googlemock/CMakeLists.txt
|
|
@@ -105,10 +105,10 @@ endif()
|
|
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}>")
|
|
|
|
########################################################################
|
|
#
|
|
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
|
|
index dce6a7c..f1da42f 100644
|
|
--- a/googletest/CMakeLists.txt
|
|
+++ b/googletest/CMakeLists.txt
|
|
@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
|
|
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}>")
|
|
if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1)
|
|
target_link_libraries(gtest PUBLIC regex)
|
|
endif()
|
|
--
|
|
2.45.2
|
|
|