From 4e3dd28fef79c9abef25fb85a1f8be6dad90e19b Mon Sep 17 00:00:00 2001 From: Andrew Beltrano Date: Tue, 16 Jul 2024 19:40:00 +0000 Subject: [PATCH] Add patch to fix gtest dependency. --- ...-absl_cc_library-target-as-test-only.patch | 24 +++++++++++++++++++ packaging/vcpkg/ports/abseil/portfile.cmake | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 packaging/vcpkg/ports/abseil/0001-Mark-absl_cc_library-target-as-test-only.patch diff --git a/packaging/vcpkg/ports/abseil/0001-Mark-absl_cc_library-target-as-test-only.patch b/packaging/vcpkg/ports/abseil/0001-Mark-absl_cc_library-target-as-test-only.patch new file mode 100644 index 00000000..23e3e4dc --- /dev/null +++ b/packaging/vcpkg/ports/abseil/0001-Mark-absl_cc_library-target-as-test-only.patch @@ -0,0 +1,24 @@ +From ccb2f752f6ba4f90eda8931de78c9d8535286602 Mon Sep 17 00:00:00 2001 +From: Andrew Beltrano +Date: Tue, 16 Jul 2024 13:36:58 -0600 +Subject: [PATCH 1/1] Mark absl_cc_library target as test-only. + +--- + absl/container/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt +index 128cc0e9..11d65d55 100644 +--- a/absl/container/CMakeLists.txt ++++ b/absl/container/CMakeLists.txt +@@ -213,6 +213,7 @@ absl_cc_library( + DEPS + absl::config + GTest::gmock ++ TESTONLY + ) + + absl_cc_test( +-- +2.43.0 + diff --git a/packaging/vcpkg/ports/abseil/portfile.cmake b/packaging/vcpkg/ports/abseil/portfile.cmake index 54a26d41..cd5c007e 100644 --- a/packaging/vcpkg/ports/abseil/portfile.cmake +++ b/packaging/vcpkg/ports/abseil/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90 HEAD_REF master + PATCHES + 0001-Mark-absl_cc_library-target-as-test-only.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,8 +30,6 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE OPTIONS -DABSL_PROPAGATE_CXX_STD=ON - -DABSL_BUILD_TESTING=OFF - -DBUILD_TESTING=OFF ${ABSL_USE_CXX17_OPTION} )