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

cmake: CURL_LIBDIRS improvements (upstreamed from vcpkg) #16610

Closed
wants to merge 2 commits into from
Closed

cmake: CURL_LIBDIRS improvements (upstreamed from vcpkg) #16610

wants to merge 2 commits into from
+4 −1

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Mar 7, 2025 •
edited
Loading

Apply downstream patches from the vcpkg project:

  • cmake: remove duplicates from CURL_LIBDIRS.

  • cmake: set CURL_LIBDIRS as INTERFACE_LINK_DIRECTORIES for static
    libcurl.
    To support CMake <3.13, change downstream patch from:

    target_link_directories(${LIB_STATIC} INTERFACE ${CURL_LIBDIRS})

    to:

    set_target_properties(${LIB_STATIC} PROPERTIES [...] INTERFACE_LINK_DIRECTORIES "${CURL_LIBDIRS}")

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

Sorry, something went wrong.

vszakats added 2 commits March 7, 2025 13:02
@vszakats
cmake: remove CURL_LIBDIRS dupes
215b8ee
@vszakats
try setting INTERFACE_LINK_DIRECTORIES for static libcurl to CURL_LIB…
Loading
Loading status checks…
aa33d28 
…DIRS

Requires CMake 3.13, meaning it should be effective there or above
but not supposed to break earlier versions just by adding this property.
@vszakats vszakats added the cmake label Mar 7, 2025
@github-actions github-actions bot added the build label Mar 7, 2025
@vszakats vszakats changed the title cmake: CURL_LIBDIRS improvements (upstreamed from the vcpkg project) cmake: CURL_LIBDIRS improvements (upstreamed from vcpkg) Mar 7, 2025
@vszakats vszakats closed this in 0ead361 Mar 7, 2025
@vszakats vszakats deleted the cm-libdirs branch March 7, 2025 12:49
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.

None yet
1 participant
@vszakats