Tomoaki Teshima
269b810601
re-enable automatic CC detection on Jetson
...
* treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate
2020-07-12 21:22:12 +09:00
Alexander Alekhin
e0f9eac521
cmake: backport CUDA scripts
2020-07-08 07:33:54 +00:00
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
2020-07-06 22:58:17 +00:00
Alexander Alekhin
5a15369d4d
Merge pull request #17729 from modeste2015:3.4
2020-07-04 17:17:57 +00:00
Alexander Alekhin
56b5a7d977
cmake: fix ENABLE_PROFILING
2020-07-03 19:31:41 +00:00
Heritier Kinke
cb3a098b25
forget to look in sub folder of include/openblas
2020-07-02 03:33:07 +02:00
Tomoaki Teshima
95ac650af6
make the fail safe path actually safe
...
* use only supported CC in the list
* workaround of #17526
2020-06-21 07:20:47 +09:00
Tomoaki Teshima
52844614c4
add Ampere CC
...
* Ampere has CC 8.0
* Arm64 server support has been added in CUDA 11 (only V100 for now)
2020-06-19 20:46:18 +09:00
Alexander Alekhin
6bd87e8146
Merge pull request #17571 from tomoaki0705:fixAutomaticCC
2020-06-18 07:39:14 +00:00
Tomoaki Teshima
1cba763189
fix build error of automatic CC detection
2020-06-17 22:02:51 +09:00
Alexander Alekhin
d01cbe9320
cudacodec(build): fix detection in CMake, cleanup duplicate includes
2020-06-17 09:09:40 +00:00
Alexander Alekhin
d321a34f7c
Merge pull request #17527 from tomoaki0705:detectCuvidHeader
2020-06-14 11:08:16 +00:00
Mehdi Zakaria Benadel
b0def9617f
Fix typo
...
This typo just made me lose my mind on the conan package update. please merge.
2020-06-12 23:52:06 +02:00
Alexander Alekhin
c2664d912a
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0
2020-06-12 21:24:35 +00:00
Alexander Alekhin
d2a9efd039
dnn: use OpenVINO 2020.3 defines
2020-06-12 20:24:08 +00:00
cyy
db3e3be8ee
improve the mkl search procedure
2020-06-12 06:59:27 +00:00
Tomoaki Teshima
d4af89781b
fix corner case of libnvcuvid
...
* detect header automatically and not based on version number
2020-06-11 23:06:18 +09:00
Tomoaki Teshima
156406b56c
select the architecture based on nvcc result
...
* cache the result
* DRY
* brush up based on review
2020-06-02 05:07:53 +09:00
Alexander Alekhin
9181ecfc7b
cmake: fix protobuf handling
2020-04-27 02:11:19 +00:00
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
2020-04-17 14:28:42 +00:00
Alexander Alekhin
c007228d0f
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
2020-04-16 12:19:58 +00:00
Alexander Alekhin
ef68cc3d5f
dnn: use OpenVINO 2020.2 defines
...
original commit: 45263d7642
2020-04-15 11:14:43 +00:00
Alexander Alekhin
49a75079f2
Merge pull request #17047 from alalek:fix_permissions
2020-04-13 12:34:08 +00:00
Alexander Alekhin
f0ffc52435
fix files permissions
2020-04-13 04:29:55 +00:00
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
2020-04-10 12:23:13 +00:00
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
2020-04-07 22:03:12 +00:00
Alexander Alekhin
7465125f67
build: add winpack_dldt build scripts
2020-03-25 21:26:41 +00:00
Alexander Alekhin
2a9a2fff66
cmake: fix find process for InferenceEngine extra libraries
2020-03-25 02:43:42 +00:00
Andrei-Florin BENCSIK
8253562794
fix: minor typo in CMakeCVDetectPython
2020-03-21 11:15:07 +02:00
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 .
2020-03-20 10:10:39 +00:00
Alexander Alekhin
4e56c1326f
core: adjust type of allocator_stats counter, allow to disable
2020-03-11 20:12:29 +03:00
Alexander Alekhin
3a99ebb446
Merge pull request #16756 from alalek:cmake_opencv_test_extra_compile_options
2020-03-11 12:38:45 +00:00
NesQl
0bcdf7d03e
Merge pull request #16724 from liqi-c:3.4-tengine
...
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-03-09 14:59:23 +00:00
Alexander Alekhin
e0a9468488
cmake: allow extra compile options for tests
2020-03-07 15:37:21 +00:00
Peter Würtz
5012fc5d23
Merge pull request #16684 from pwuertz:ignore_clang_mat_inl
...
* Ignore clang warnings for deprecated enum+enum operations in mat.inl.hpp
* build: added customization macros, cmake flags for OpenCV build
2020-02-28 21:21:03 +03:00
Ivan Galanin
f9bd025722
Merge pull request #16639 from iigalanin:patch-1
...
* Update to new ICV packages
MacOS ia32 ICV package is no longer built.
* cmake(ippicv): add Apple 32-bit check
* Updated commit hash
2020-02-25 22:04:11 +03:00
Alexander Alekhin
c41f50f5f7
Merge pull request #16559 from alalek:cmake_msvc_mp_customize
2020-02-13 19:28:57 +00:00
Alexander Alekhin
d81a0da3e0
dnn: use OpenVINO 2020.1 defines
2020-02-12 17:21:08 +03:00
Alexander Alekhin
ef93aea0da
cmake: update handling of MSVC /MP flag
2020-02-11 21:05:44 +00:00
Alexander Alekhin
9d0f16e8fe
Merge pull request #16505 from alalek:issue_16326
2020-02-10 15:51:49 +00:00
Ilya Lavrenov
41f444a230
CMAKE: more robust custom IE libraries support
...
backporting of commit 98d96f2cc8
2020-02-10 17:55:51 +03:00
Alexander Alekhin
85a59ef292
cmake: hide IPPICV symbols using --exclude-libs
2020-02-04 18:11:07 +03:00
Rajkiran Natarajan
579dcf12bd
GCC 10 warnings not caught by CMake ignore regex
2020-02-03 06:39:14 +00:00
Sayed Adel
bd531bd828
core:vsx fix inline asm constraints
...
generalize constraints to 'wa' for VSX registers
2020-01-28 15:48:00 +02:00
Alexander Alekhin
02f8a9470a
Merge pull request #16441 from alalek:abi_checker_exclude_modules_3.4
2020-01-27 13:26:23 +00:00
Alexander Alekhin
4af55e64e9
cmake: support OPENCV_ABI_SKIP_MODULES_LIST
...
backporting of commit f163778da7
2020-01-27 14:40:48 +03:00
Alexander Alekhin
8af87d5792
cmake: apply '-Wl,--as-needed' linker option
2020-01-21 19:09:38 +03:00
h6197627
fb3a334bbe
cmake: fix Linux system OpenEXR detection
2020-01-16 23:12:41 +02:00
Alexander Alekhin
d064079a4e
build: eliminate build warnings
2019-12-25 23:28:24 +00:00
Tatsuro Shibamura
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00