diff --git a/dev-libs/gtest/gtest-1.11.0.recipe b/dev-libs/gtest/gtest-1.11.0.recipe index 44bd5fbf7..933603b8d 100644 --- a/dev-libs/gtest/gtest-1.11.0.recipe +++ b/dev-libs/gtest/gtest-1.11.0.recipe @@ -19,6 +19,7 @@ SOURCE_URI="https://github.com/google/googletest/archive/release-$portVersion.ta CHECKSUM_SHA256="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5" SOURCE_FILENAME="googletest-release-$portVersion.tar.gz" SOURCE_DIR="googletest-release-$portVersion" +PATCHES="gtest-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" diff --git a/dev-libs/gtest/patches/gtest-1.11.0.patchset b/dev-libs/gtest/patches/gtest-1.11.0.patchset new file mode 100644 index 000000000..5bce1f883 --- /dev/null +++ b/dev-libs/gtest/patches/gtest-1.11.0.patchset @@ -0,0 +1,43 @@ +From f158183b7b7af0e1630d4e9f1e161f65e27a5d48 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 20 Oct 2021 16:43:05 +0200 +Subject: fix CMake config files + + +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index e7df8ec..869bfcb 100644 +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -111,10 +111,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 abdd98b..7ae174d 100644 +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) + 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) + +-- +2.30.2 +