Skip to content
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

Jump to bottom

build: cmake multi-pkg-config detection improvements (brotli, ldap, mbedtls) #16479

Closed
wants to merge 5 commits into from
Closed

build: cmake multi-pkg-config detection improvements (brotli, ldap, mbedtls) #16479

wants to merge 5 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Feb 25, 2025 •
edited
Loading

Apply downstream patch from the vcpkg project:

  • cmake/FindBrotli: streamline detecting multiple pkg-config modules.
    Add libbrotlicommon to Requires.private in libcurl.pc.

Apply the above idea to the rest of multi-module dependencies:

  • cmake/FindMbedTLS: streamline detecting multiple pkg-config modules
    Add mbedx509, mbedcrypto to Requires.private in libcurl.pc.

  • cmake/FindLDAP: streamline detecting multiple pkg-config modules

And sync these changes with autotools, and add libbrotlicommon,
mbedx509, mbedcrypto to Requires.private.

Co-authored-by: Kai Pastor
Ref: microsoft/vcpkg#43819

  • sync autotools with the brotli change.

/cc @dg0yt

@vszakats vszakats added the cmake label Feb 25, 2025
@vszakats vszakats marked this pull request as draft February 25, 2025 15:38
@github-actions github-actions bot added the build label Feb 25, 2025
@vszakats vszakats changed the title cmake: apply patches from the vcpkg project build: apply cmake patches from vcpkg Feb 25, 2025
@vszakats vszakats marked this pull request as ready for review February 25, 2025 22:00
@vszakats

This comment was marked as resolved.

Sign in to view
@vszakats vszakats changed the title build: apply cmake patches from vcpkg build: cmake libdir and multi-pkg-config detection improvements Mar 4, 2025
@vszakats vszakats changed the title build: cmake libdir and multi-pkg-config detection improvements build: cmake multi-pkg-config detection improvements (brotli, ldap, mbedtls) Mar 7, 2025
@vszakats vszakats closed this in 3b50197 Mar 7, 2025
@vszakats vszakats deleted the cm-via-vcpkg branch March 7, 2025 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
build cmake
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vszakats