[liblzma] Generally fix output name #20751
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
JackBoosY
added
the
category:community-triplet
JackBoosY
approved these changes
Oct 15, 2021
dg0yt
changed the title
|
I had to revise the PR after more testing, and came to a more general fix. I update the initial post. Sorry for the inconvenience. |
dg0yt
commented
Oct 20, 2021
| target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) | ||
| target_include_directories(liblzma PRIVATE windows/vs2019) | ||
| # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. | ||
| # Avoid the name lzma.dll because it would conflict with LZMA SDK. |
There was a problem hiding this comment.
The name lzma.dll wasn't and isn't avoided in vcpkg so far. If desired, we need to set property RUNTIME_OUTPUT_NAMEto liblzma (for win32 but not mingw).
|
All checks green. |
JackBoosY
approved these changes
Oct 26, 2021
|
Thanks for the fixes! |
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.
What does your PR fix?
This PR fixes liblzma to not mess with the platform's prefix but simply always use the
lzma"namespec" that matches-llzma[d]as used in the .pc file. This fixes library name issues on mingw. The change is complemented by tightening thefind_calls in the exported cmake configuration.Another change fixes the warning about the unused
CMAKE_DEBUG_POSTFIXvariable.Which triplets are supported/not supported? Have you updated the CI baseline?
unchanged
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