Open Source Computer Vision Library
Go to file
Zhuo Zhang a5a421a9f1
Merge pull request #19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19
* fix find zlib.so instead of zlib.a when NDK >= 19

On Android platform, `libopencv_imgcodecs.a` is built, expected to
depend on `libz.so`. However, since Android NDK r19, NDK's `libz.a`
is found instead of `libz.so`, leading to link error
(not found libz.a) on machines without same NDK version & direcotry.

Since Android NDK-r19, toolchain pieces are installed to
`$NDK/toolchains/llvm/prebuilt/<host-tag>/...`, including `libz.so`.
Also installed to old paths (`<NDK>/platforms` and `<NDK>/sysroot`)
in NDK r19, r20, r21, but since NDK 22, old paths are removed.

- https://github.com/android/ndk/wiki/Changelog-r19
- https://github.com/android/ndk/wiki/Changelog-r22

With this commit, `libz.so` can be correctly found in NDK<19 and NDK>=19.

`ZLIB_LIBRARIES` is also simplified as `z`, by appending match (regex)
patterns for new toolchain installation directory's libz.so's paths.

* simplify libz.so match pattern for abbreviation
2021-02-14 21:38:53 +03:00
.github Updated more links to forum.opencv.org 2021-01-19 21:55:45 +03:00
3rdparty android: add -llog for libprotobuf 2020-12-10 20:00:58 +00:00
apps Fix typo 'Applicatioin' 2020-11-17 15:02:55 +00:00
cmake Merge pull request #19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19 2021-02-14 21:38:53 +03:00
data fix files permissions 2020-04-13 04:29:55 +00:00
doc Merge pull request #19376 from alalek:fixup_19105 2021-01-22 20:22:36 +00:00
include add missing DNN header to opencv2/opencv.hpp 2018-02-15 15:59:14 +01:00
modules Merge pull request #19521 from zchrissirhcz:3.4-fix-core-module-android-arm64-build 2021-02-14 21:37:11 +03:00
platforms Pass custom config file path as absolute 2021-02-10 12:45:35 +01:00
samples Update imageSegmentation.cpp, imageSegmentation.py 2021-02-07 17:42:52 +03:00
.editorconfig add .editorconfig 2018-10-11 17:57:51 +00:00
.gitattributes cmake: generate and install ffmpeg-download.ps1 2018-06-09 13:19:48 +03:00
.gitignore Ignore Visual Studio cmake configuration file 2020-03-17 21:12:54 +03:00
CMakeLists.txt cmake: fix pylint/flake8 detection, update flake8 exclude 2021-01-29 17:06:54 +00:00
CONTRIBUTING.md migration: github.com/opencv/opencv 2016-07-12 12:51:12 +03:00
LICENSE copyright: 2021 2021-01-01 13:40:32 +00:00
README.md update forum link 2021-01-11 18:39:46 +00:00

OpenCV: Open Source Computer Vision Library

Resources

Contributing

Please read the contribution guidelines before starting work on a pull request.

Summary of the guidelines:

  • One pull request per issue;
  • Choose the right base branch;
  • Include tests and documentation;
  • Clean up "oops" commits before submitting;
  • Follow the coding style guide.