-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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.
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
[cmake-user] Verify library location for debug vs. release, fix ports #21641
Conversation
Removed CURL and OpenSSL from this test again. These wrappers seem to need more work, and the PR is big enough. |
I wish other guys to review the |
I would love to use the functions from #21783 for reimplementing the debug/release configuration setup for legacy find modules. I also learned that I cannot easily move the wrapper tests to the actual ports: During portfile execution, the wrapper is in the staging dir (packages). It would take additional changes to accept a wrapper from the staging dir. OTOH it would allow a consolidatet |
Can you please resolve the file conflicts? Thanks. |
#22258 could replace |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor changes requested
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/freetype/vcpkg.json
ports/icu/vcpkg.json
scripts/test_ports/cmake-user/vcpkg.json
Valid values for the license field can be found in the documentation
The new Curses error is from looking at
(Port ncurses provides a "ncurses" lib, not a "curses" lib.) There are two aspects:
To unblock the other changes in this PR, I will remove Curses from the test for now. To fully follow recommended CMake package practices, I will also check |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/freetype/vcpkg.json
ports/icu/vcpkg.json
scripts/test_ports/cmake-user/vcpkg.json
Valid values for the license field can be found in the documentation
Note to self: The postfix is from |
This seems to have randomly fixed qtdeclarative, which results in qtinterfaceframework now running (and failing)... |
If the PR just happened to build less, given the diagnosis in #23755 that makes sense that it would 'randomly fix'. |
This PR didn't fix that. The qtdeclarative regression depends on the number of installed ports. |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Hm, this used to be tested in daily CI only, not in PR CI. |
CI bug: #23862 |
Since x64-osx is only failing due to #23862, I'm good with merging as is; I'll ask one other person to confirm then merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/freetype/vcpkg.json
ports/icu/vcpkg.json
scripts/test_ports/cmake-user/vcpkg.json
Valid values for the license field can be found in the documentation
Ah, sorry I missed this before pushing a master merge. :/ At least we'll see that things are fixed :) |
All green now. |
Thanks @dg0yt! |
What does your PR fix?
Extends the user project test port to verify that library locations match the build type.
Always runs tests with the current CMake, in addition to the (optional) minimum supported version. Enables testing of find modules added to CMake after the minimum supported version (e.g. ICU).
Adds
find_package
testing for ICU, JPEG, TIFF.Modernizes, and adds a wrapper for CMake < 3.7 to, port bzip2.Revises and fixes the wrapper for CMake < 3.7 in port freetype.
Fixes the wrapper in port icu.
Fixes the wrapper for CMake < 3.12 in port libjpeg-turbo.
In general, for old cmake find modules which don't support debug+release in
<PKG>_LIBRARY
, the wrappers now choose the debug lib for theDebug
configuration, and the release lib otherwise. This fixes usage of<PKG>_LIBRARY
as a single filepath, such as in the oldFindJPEG.cmake
.Which triplets are supported/not supported? Have you updated the CI baseline?
all, no
Does your PR follow the maintainer guide?
yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?yes