Conditionally update zlib name in get_system_library_name#662
Merged
Conversation
johnwparent
approved these changes
Apr 8, 2021
dstoup
approved these changes
Apr 8, 2021
Collaborator
There was a problem hiding this comment.
I'm ok with this provided CI passes. I have to check on the static CI to see if it's running. That said, as long as it doesn't mess up what most people do, all good. We can fix other issues later. At some point I need to overhaul how things are done in Fletch but that's not today.
Collaborator
Collaborator
Collaborator
Collaborator
Member
|
Looks like Windows failure is due to the Kwiver cmake discover tests issue, rather than a bug in this PR. |
Collaborator
|
Looks good. Do we want/need this patch for the release? If so, change the target to the release branch, otherwise let me know and I will merge. |
Contributor
Author
|
I think the fix is required for the kwiver wheel and does not effect the shared build. So it is not necessary to add it to 1.4.x. |
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
4 participants
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.
The static build for zlib is called libz.a rather libzlib.a. Thus PR checks if the build is static or dynamic and provides the zlib name based on the type of build