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
4 years ago
Alexander Alekhin
d2d6eba16a
cmake: fix add_apple_compiler_options() calls and OBJCXX handling
4 years ago
Alexander Alekhin
e448f4f6ef
cmake: fix pylint/flake8 detection, update flake8 exclude
4 years ago
Alexander Alekhin
8215380336
cmake: support ccache with Xcode generator
4 years ago
Ilya Lavrenov
064d48771d
Find only shared IE libraries, not plugins
...
original commit: 3ed376d103
4 years ago
Alexander Alekhin
752cc26ad6
dnn: use OpenVINO 2021.2 defines
...
original commit: 4699d2ba0c
4 years ago
Alexander Alekhin
b3937288e5
cmake: update MKL library searching
...
- allow to specify MKL_LIBRARIES through command-line
4 years ago
Alexander Alekhin
7fa9efbfd8
cmake: fix handling of wrappers dependencies
4 years ago
Alexander Alekhin
6bfb0dda85
cmake: avoid duplication of -Winit-self flag
4 years ago
Alexander Alekhin
8ae1552a5b
cmake: avoid excessive output from cmake --trace/--trace-expand
...
- `cmake . --trace-expand -DCMAKE_TRACE_MODE=1`
4 years ago
Alexander Alekhin
7e5c4fe1cd
cmake(js): update js targets
...
- unconditional js bindings source code generation
- use common name for tests: opencv_test_js
4 years ago
Alexander Alekhin
b31ce408ae
cmake: fix processing order of <wrapper>_bindings_generator
...
- ensure that wrapped modules are already processed
4 years ago
Alexander Alekhin
c42d47d94a
cmake: clean cached INTERNAL variable used for 3rdparty deps
4 years ago
Alexander Alekhin
387a76ba59
build: xcode 12 support, cmake fixes
4 years ago
Alexander Alekhin
ac418e999d
cmake: update condition for find_package(Eigen3 CONFIG)
4 years ago
catree
df7bf9a048
Fix typo in OpenCVFindOpenBLAS.cmake file.
4 years ago
Alexander Alekhin
bed5debca6
dnn: use OpenVINO 2021.1 defines
4 years ago
Alexander Alekhin
a6e15b2f57
cmake: prefer using Eigen configuration files
...
- for better compatibility with Ceres 2.0.0 CMake scripts
4 years ago
Alexander Alekhin
364702b1c9
cmake(3rdparty): use EXCLUDE_FROM_ALL
4 years ago
Alexander Alekhin
171fbf879f
cmake: fix typo in CUDA_GENERATION=Auto cache
4 years ago
Alexander Alekhin
691c655630
ippicv: install third-party-programs.txt file
4 years ago
Tomoaki Teshima
ac58b2f857
compute capability 8.6
...
- CC for RTX3090, RTX3080 and RTX3070
4 years ago
Maksim Shabunin
2dff2f36bf
Install: added prebuilt samples installation
4 years ago
Tomoaki Teshima
d92af2aa85
* stop showing old generations
...
* keep it possible to build for old CC
* make sure old generations don't come up for the choice
* remove related version check of old one
4 years ago
Alexander Alekhin
435b6df989
dnn: use OpenVINO 2020.4 defines
...
original commit: 2813aa7eb9
4 years ago
Tomoaki Teshima
269b810601
re-enable automatic CC detection on Jetson
...
* treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate
4 years ago
Alexander Alekhin
e0f9eac521
cmake: backport CUDA scripts
4 years ago
Alexander Alekhin
eb6678ebef
Merge pull request #17699 from alalek:build_core_cuda
...
* core(cuda): fix build
- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167
* cmake(cuda): backport workaround for CUDA 11
* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize
* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
4 years ago
Alexander Alekhin
56b5a7d977
cmake: fix ENABLE_PROFILING
4 years ago
Heritier Kinke
cb3a098b25
forget to look in sub folder of include/openblas
4 years ago
Tomoaki Teshima
95ac650af6
make the fail safe path actually safe
...
* use only supported CC in the list
* workaround of #17526
4 years ago
Tomoaki Teshima
52844614c4
add Ampere CC
...
* Ampere has CC 8.0
* Arm64 server support has been added in CUDA 11 (only V100 for now)
4 years ago
Tomoaki Teshima
1cba763189
fix build error of automatic CC detection
4 years ago
Alexander Alekhin
d01cbe9320
cudacodec(build): fix detection in CMake, cleanup duplicate includes
4 years ago
Mehdi Zakaria Benadel
b0def9617f
Fix typo
...
This typo just made me lose my mind on the conan package update. please merge.
4 years ago
Alexander Alekhin
d2a9efd039
dnn: use OpenVINO 2020.3 defines
4 years ago
cyy
db3e3be8ee
improve the mkl search procedure
4 years ago
Tomoaki Teshima
d4af89781b
fix corner case of libnvcuvid
...
* detect header automatically and not based on version number
5 years ago
Tomoaki Teshima
156406b56c
select the architecture based on nvcc result
...
* cache the result
* DRY
* brush up based on review
5 years ago
Alexander Alekhin
9181ecfc7b
cmake: fix protobuf handling
5 years ago
Maksim Shabunin
2840362868
Merge pull request #16769 from mshabunin:fix-ipp-install
...
* Do not copy standalone IPP libraries to install for static builds
* Restored IPP installation under option
5 years ago
Alexander Alekhin
ef68cc3d5f
dnn: use OpenVINO 2020.2 defines
...
original commit: 45263d7642
5 years ago
Alexander Alekhin
f0ffc52435
fix files permissions
5 years ago
Xiping Yan
5c7c80dd27
Merge pull request #17028 from xipingyan:patch-1
...
* Update OpenCVFindVA_INTEL.cmake
When set env VA_INTEL_IOCL_ROOT, "if($ENV{VA_INTEL_IOCL_ROOT})" don't work.
My modification as follow.
- if($ENV{VA_INTEL_IOCL_ROOT})
+ if(DEFINED ENV{VA_INTEL_IOCL_ROOT})
Refer: https://cmake.org/cmake/help/latest/variable/ENV.html
* based on merge comment, update code
5 years ago
Alexander Alekhin
5504d94e36
cmake: update generation of 'uninstall' target
...
Details: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
5 years ago
Alexander Alekhin
7465125f67
build: add winpack_dldt build scripts
5 years ago
Alexander Alekhin
2a9a2fff66
cmake: fix find process for InferenceEngine extra libraries
5 years ago
Andrei-Florin BENCSIK
8253562794
fix: minor typo in CMakeCVDetectPython
5 years ago
NesQl
bf224e61a9
Merge pull request #16832 from liqi-c:3.4-tengine-android
...
* Add android support for tengine
* modify tengine download use commit id
* Del some invalid log in Tengine
* Test. default enable tengine
* ndk version judegment
* Close test . set Tengine default OFF
* Logic problem
* test .Android NDK judgement .
* Cmake error modify.
* cmake: cleanup tengine scripts
* cmake: use tengine target name
* cmake: disable testing of BUILD_ANDROID_PROJECTS=OFF
* Close test .
5 years ago
Alexander Alekhin
4e56c1326f
core: adjust type of allocator_stats counter, allow to disable
5 years ago