mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-24 14:06:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
a5a421a9f1
opencv/cmake
History
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
..
android Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private 2019-12-13 17:52:40 +03:00
checks fix files permissions 2020-04-13 04:29:55 +00:00
FindCUDA FIx misc. source and comment typos 2019-08-15 13:09:52 +03:00
platforms cmake(js): update js targets 2020-12-03 14:18:54 +00:00
templates cmake: support ccache with Xcode generator 2021-01-15 19:58:01 +00:00
cl2cpp.cmake cmake: don't add include <module>/src directory to avoid conflicts 2018-03-19 11:14:15 +03:00
copy_files.cmake cmake: fix android examples dependencies 2018-03-15 14:17:02 +03:00
FindCUDA.cmake Misc. typos 2018-07-31 18:44:23 +03:00
FindFlake8.cmake cmake: fix pylint/flake8 detection, update flake8 exclude 2021-01-29 17:06:54 +00:00
FindGstreamerWindows.cmake Newer versions of gstreamer use a slightly different include path on windows. 2016-10-20 11:02:18 -04:00
FindOpenVX.cmake Updated OpenVX detector and wrappers to handle Reference attribute names change 2017-03-22 16:50:38 +03:00
FindPylint.cmake cmake: fix pylint/flake8 detection, update flake8 exclude 2021-01-29 17:06:54 +00:00
OpenCVCompilerDefenses.cmake Added support for Clang build hardening (including Apple) 2019-05-07 13:00:43 +03:00
OpenCVCompilerOptimizations.cmake cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P 2019-12-11 00:21:10 +00:00
OpenCVCompilerOptions.cmake cmake: support ccache with Xcode generator 2021-01-15 19:58:01 +00:00
OpenCVCRTLinkage.cmake cmake: update handling of MSVC /MP flag 2020-02-11 21:05:44 +00:00
OpenCVDetectApacheAnt.cmake FIx misc. source and comment typos 2019-08-15 13:09:52 +03:00
OpenCVDetectCStripes.cmake Merge pull request #9075 from TonyLianLong:master 2017-07-03 16:14:17 +00:00
OpenCVDetectCUDA.cmake cmake: fix typo in CUDA_GENERATION=Auto cache 2020-10-09 22:00:02 +00:00
OpenCVDetectCXXCompiler.cmake core: adjust type of allocator_stats counter, allow to disable 2020-03-11 20:12:29 +03:00
OpenCVDetectDirectX.cmake Merge pull request #14294 from alalek:issue_14286 2019-04-11 17:50:15 +03:00
OpenCVDetectHalide.cmake cmake: add Halide support (#8794) 2017-06-21 14:33:47 +03:00
OpenCVDetectInferenceEngine.cmake Find only shared IE libraries, not plugins 2020-12-24 06:48:54 +00:00
OpenCVDetectMediaSDK.cmake MediaSDK video backend: Windows support 2017-10-11 16:33:37 +03:00
OpenCVDetectOpenCL.cmake Merge pull request #14294 from alalek:issue_14286 2019-04-11 17:50:15 +03:00
OpenCVDetectPython.cmake fix: minor typo in CMakeCVDetectPython 2020-03-21 11:15:07 +02:00
OpenCVDetectTBB.cmake Fix TBB debug 2019-05-27 10:26:06 +03:00
OpenCVDetectTrace.cmake trace: initial support for code trace 2017-06-26 17:07:13 +03:00
OpenCVDetectVTK.cmake cmake: fix variable expand in CMake conditions 2018-10-21 15:02:40 +00:00
OpenCVDownload.cmake cmake: add directory creation to download helper scripts 2019-09-04 17:09:13 +03:00
OpenCVExtraTargets.cmake cmake: update generation of 'uninstall' target 2020-04-07 22:03:12 +00:00
OpenCVFindAtlas.cmake moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository (#7918) 2016-12-22 22:57:44 +03:00
OpenCVFindFrameworks.cmake Detect cross-cutting frameworks before libraries so the latter can use them 2018-11-01 18:16:41 +03:00
OpenCVFindIntelPerCSDK.cmake Fix notes about cmake files. Fix build warning. 2013-12-17 16:13:55 +04:00
OpenCVFindIPP.cmake ippicv: install third-party-programs.txt file 2020-09-25 22:09:25 +00:00
OpenCVFindIPPIW.cmake Merge pull request #16769 from mshabunin:fix-ipp-install 2020-04-17 14:28:42 +00:00
OpenCVFindLAPACK.cmake LAPACK: add support for complex numbers for MSVC 2019-05-22 18:43:45 +03:00
OpenCVFindLATEX.cmake Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options. 2012-01-03 13:48:12 +00:00
OpenCVFindLibsGrfmt.cmake Merge pull request #19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19 2021-02-14 21:38:53 +03:00
OpenCVFindLibsGUI.cmake highgui: fixed build GTK2+OpenGL 2019-05-23 16:30:22 +03:00
OpenCVFindLibsPerf.cmake cmake: update condition for find_package(Eigen3 CONFIG) 2020-11-22 16:28:53 +00:00
OpenCVFindLibsVideo.cmake cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P 2019-12-11 00:21:10 +00:00
OpenCVFindMKL.cmake cmake: update MKL library searching 2020-12-09 16:36:15 +00:00
OpenCVFindOpenBLAS.cmake Fix typo in OpenCVFindOpenBLAS.cmake file. 2020-11-08 14:42:47 +01:00
OpenCVFindOpenEXR.cmake Fix typo 2020-06-12 23:52:06 +02:00
OpenCVFindOpenNI2.cmake cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P 2019-12-11 00:21:10 +00:00
OpenCVFindOpenNI.cmake cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P 2019-12-11 00:21:10 +00:00
OpenCVFindProtobuf.cmake cmake: fix protobuf handling 2020-04-27 02:11:19 +00:00
OpenCVFindTengine.cmake Merge pull request #16832 from liqi-c:3.4-tengine-android 2020-03-20 10:10:39 +00:00
OpenCVFindVA_INTEL.cmake Merge pull request #17028 from xipingyan:patch-1 2020-04-10 12:23:13 +00:00
OpenCVFindVA.cmake cmake: allow to specify own libva paths 2018-08-10 16:03:10 +03:00
OpenCVFindWebP.cmake update CMakeList.txt 2018-02-05 16:23:52 +03:00
OpenCVFindXimea.cmake XIMEA cam support: allow on OS X too 2014-09-09 19:25:14 +04:00
OpenCVGenABI.cmake cmake: support OPENCV_ABI_SKIP_MODULES_LIST 2020-01-27 14:40:48 +03:00
OpenCVGenAndroidMK.cmake android: move .a files into 'staticlibs' directory 2018-02-15 16:31:49 +03:00
OpenCVGenConfig.cmake Windows: partially restore install config generation 2019-09-16 12:11:48 +03:00
OpenCVGenHeaders.cmake cmake: support multiple CPU targets 2017-02-13 19:52:59 +03:00
OpenCVGenInfoPlist.cmake Merge pull request #8009 from Legoless:master 2017-01-20 19:16:01 +03:00
OpenCVGenPkgconfig.cmake Removed cmake submodules and contrib_world references 2017-10-19 17:34:59 +03:00
OpenCVGenSetupVars.cmake cmake: fix python install paths 2018-12-17 14:32:29 +03:00
OpenCVInstallLayout.cmake Windows: partially restore install config generation 2019-09-16 12:11:48 +03:00
OpenCVMinDepVersions.cmake cmake: update initialization 2019-08-08 15:23:16 +03:00
OpenCVModule.cmake cmake: fix handling of wrappers dependencies 2020-12-08 19:10:04 +00:00
OpenCVPackaging.cmake cmake: fix variable expand in CMake conditions 2018-10-21 15:02:40 +00:00
OpenCVPCHSupport.cmake Fix pch generation when linker flags used with GCC 2019-12-10 14:55:56 +00:00
OpenCVPylint.cmake cmake: fix Ninja generator warning about pylintrc 2018-04-10 12:23:10 +03:00
OpenCVUtils.cmake cmake: avoid excessive output from cmake --trace/--trace-expand 2020-12-05 13:29:43 +00:00
OpenCVVersion.cmake cmake: hide 'junk' dir from the root of build directory 2018-12-07 05:14:08 +00:00