[vcpkg-ci-curl,curl,c-ares,libssh2,librtmp] Elaborate test, fix ports #43463
+578
−358
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unofficial, unneeded, breaking pkg-config.
FrankXie05
added
the
category:code-cleanup
dg0yt
changed the title
No duplication, no wrong build type from imported targets
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #43403 (comment).
Fixes insufficient use and export of link libraries.
Fixes broken pkgconfig files.
Fixes broken
curl-config.Fixes invalid mixup of release/debug library paths.
Adds the missing
vcpkg-ci-curl:*-uwp=pass.Upstream curl did a lot of work on dependency import/export with regard to pkg-config.
Leveraging this work can reduce the amount of patching needed (at the price of using less CMake config).
Unfortunately, patching is still needed to use full link libraries from the pc files, and to generate reasonable libcurl.pc and curl-config with no duplications and no build-type mixup.
Upstream libssh2 uses almost literally the same CMake code for pkgconfig export as in curl. However, it didn't use ZLIB::ZLIB and stumbled over multi-config ZLIB_LIBRARIES instead. This PR simply applies the curl pattern to libssh2, which also benefits the combined use. (But there is no
libssh2-configscript.)Extending the test port to actually build, with all three configuration exports, helps to fix old quirks and to safeguard against new regressions.