Skip to content

android: set all zlib variables used by downstream packages#21508

Merged
opencv-pushbot merged 1 commit intoopencv:4.xfrom
tailsu:sd/fix-zlib-png-android
Jan 31, 2022
Merged

android: set all zlib variables used by downstream packages#21508
opencv-pushbot merged 1 commit intoopencv:4.xfrom
tailsu:sd/fix-zlib-png-android

Conversation

@tailsu
Copy link
Copy Markdown
Contributor

@tailsu tailsu commented Jan 24, 2022

Fixes #21507

OpenCV uses ZLIB_LIBRARIES everywhere, but FindPNG depends on ZLIB_LIBRARY instead. The PR fixes all ZLIB variables that contain the full path to libz.so after FindZLIB runs.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@opencv-pushbot opencv-pushbot merged commit 6811d3d into opencv:4.x Jan 31, 2022
@tailsu tailsu deleted the sd/fix-zlib-png-android branch February 3, 2022 12:24
@alalek alalek mentioned this pull request Feb 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Android build with external libpng is bogus

3 participants