[qtkeychain] Fix the CMake export target on windows#25018
Merged
ras0219-msft merged 2 commits intomicrosoft:masterfrom Jun 2, 2022
Merged
[qtkeychain] Fix the CMake export target on windows#25018ras0219-msft merged 2 commits intomicrosoft:masterfrom
ras0219-msft merged 2 commits intomicrosoft:masterfrom
Conversation
JonLiu1993
approved these changes
Jun 1, 2022
Contributor
|
I tested the usage successfull : |
Contributor
Author
|
The upstream PR has just been merged. |
Contributor
Author
|
This PR is still needed to pull the upstream changes in. But we can point to the particular comit instead of using a patch with the same content. I will prepare this tonight. |
Contributor
Author
|
Done. @JonLiu1993 can you have another look? I have also updated the qt6 version. |
This was referenced Jun 1, 2022
JonLiu1993
approved these changes
Jun 2, 2022
Contributor
|
LGTM, thanks for your pr! |
ras0219-msft
approved these changes
Jun 2, 2022
Contributor
ras0219-msft
left a comment
There was a problem hiding this comment.
This LGTM, thanks for the fix!
This file contains hidden or 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
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.
It turns out that the fix from #24013 that allows to use CMake < 3.18 does not work on windows. This adds a patch that reintroduces the alias solution but under a cmake version guard.
I have propose this also upstream frankosterfeld/qtkeychain#212, but did not yet get a responds since May 8th.
What does your PR fix?
It fixes the exported CMake target on windows
Which triplets are supported/not supported? Have you updated the CI baseline?
No change
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes