Created
April 24, 2020 05:33
-
-
Save ganadist/786652fe36c899ad7ebcdb7861b1a09f to your computer and use it in GitHub Desktop.
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
| --- opencv-2.4.13.6/cmake/OpenCVFindLibsGrfmt.cmake.bak 2020-04-24 13:33:01.754834282 +0900 | |
| +++ opencv-2.4.13.6/cmake/OpenCVFindLibsGrfmt.cmake 2020-04-24 13:33:33.498503698 +0900 | |
| @@ -7,12 +7,9 @@ | |
| ocv_clear_vars(ZLIB_FOUND) | |
| else() | |
| include(FindZLIB) | |
| - if(ZLIB_FOUND AND ANDROID) | |
| - if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR | |
| - ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so") | |
| + if(ANDROID) | |
| set(ZLIB_LIBRARY z) | |
| set(ZLIB_LIBRARIES z) | |
| - endif() | |
| endif() | |
| endif() | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment