Skip to content

Fix pkg-config dependency resolution performance (#24610) #24887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elskow wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −16
Open

Fix pkg-config dependency resolution performance (#24610) #24887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions cmake/install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
include(GNUInstallDirs)

foreach(_target IN LISTS protobuf_ABSL_USED_TARGETS)
# 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")

set(_protobuf_PC_REQUIRES "")
set(_sep "")
foreach (_target IN LISTS _pc_targets)
string(CONCAT _protobuf_PC_REQUIRES "${_protobuf_PC_REQUIRES}" "${_sep}" "${_target}")
set(_sep " ")
endforeach ()
# pkg-config dependencies: only list abseil packages whose types are exposed
# in public headers. Listing all internal deps causes exponential blowup in
# pkg-config's dependency resolution (see GitHub issue #24610).
if (BUILD_SHARED_LIBS AND MSVC)
set(_protobuf_PC_REQUIRES "abseil_dll utf8_range")
set(_protobuf_lite_PC_REQUIRES "abseil_dll utf8_range")
else()
# Abseil types exposed in protobuf public headers
set(_protobuf_PC_REQUIRES "absl_absl_check absl_absl_log absl_btree absl_cord absl_hash absl_log_severity absl_span absl_strings absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_optional absl_status absl_statusor absl_synchronization utf8_range")
# Abseil types exposed in protobuf-lite public headers (subset of above)
set(_protobuf_lite_PC_REQUIRES "absl_absl_check absl_absl_log absl_btree absl_cord absl_hash absl_log_severity absl_span absl_strings utf8_range")
endif()

set(_protobuf_PC_CFLAGS)
if (protobuf_BUILD_SHARED_LIBS)
set(_protobuf_PC_CFLAGS -DPROTOBUF_USE_DLLS)
Expand Down
2 changes: 1 addition & 1 deletion cmake/protobuf-lite.pc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: Protocol Buffers
Description: Google's Data Interchange Format
Version: @protobuf_VERSION@
Requires: @_protobuf_PC_REQUIRES@
Requires: @_protobuf_lite_PC_REQUIRES@
Libs: -L${libdir} -lprotobuf-lite @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir} @_protobuf_PC_CFLAGS@
Conflicts: protobuf
Loading