From fe6edca15b2d80df79ab31117dc49621ef461202 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Wed, 21 Feb 2024 19:35:47 -0800 Subject: [PATCH] fix pkg-config metadata for shared abseil on windows (#15888) Closes #15883, tested in https://github.com/conda-forge/libprotobuf-feedstock/pull/209 Closes #15888 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/15888 from h-vetinari:absl_pkgconfig 9062aa945b4cdf5af76abcfeb14eea471d234a42 PiperOrigin-RevId: 609206067 --- cmake/install.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/install.cmake b/cmake/install.cmake index 52914a8ea9..c822838d03 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -1,7 +1,10 @@ include(GNUInstallDirs) foreach(_target IN LISTS protobuf_ABSL_USED_TARGETS) - string(REPLACE :: _ _modified_target ${_target}) + # shared abseil on windows breaks the absl::foo -> absl_foo replacement logic - + # preempt this by a more specific replace (harmless if it doesn't apply); see GH-15883 + string(REPLACE "absl::abseil_dll" "abseil_dll" _modified_target ${_target}) + string(REPLACE :: _ _modified_target ${_modified_target}) list(APPEND _pc_targets ${_modified_target}) endforeach() list(APPEND _pc_targets "utf8_range")