Alexander Alekhin
a7de4aca6a
cmake: update ocv_download
...
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
2017-03-30 19:36:33 +00:00
Alexander Alekhin
7cc97fd96c
Merge pull request #8421 from mshabunin:download-cache
2017-03-28 11:13:14 +00:00
Alexander Alekhin
005c4777c7
cmake: fix MSVC static builds
2017-03-25 01:28:43 +03:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Alexander Alekhin
69df0eee77
cmake: fix try_compile() with --coverage flags
2017-03-23 18:15:24 +03:00
Alexander Alekhin
17e5e4cd5a
core: CPU target dispatcher update
...
- use suffixes like '.avx.cpp'
- added CMake-generated files for '.simd.hpp' optimization approach
- wrap HAL intrinsic headers into separate namespaces for different build flags
- automatic vzeroupper insertion (via CV_INSTRUMENT_REGION macro)
2017-03-23 16:12:11 +03:00
Egor Pugin
a321cce5e4
Fix build under directories with '.cpp' string.
2017-03-23 14:42:23 +03:00
Alexander Alekhin
bcac7bd6d2
Merge pull request #8423 from terfendail:vt_ivx_enumupdate
2017-03-22 15:23:34 +00:00
Vitaly Tuzov
5ebf066dd5
Updated OpenVX detector and wrappers to handle Reference attribute names change
2017-03-22 16:50:38 +03:00
Vadim Pisarevsky
a57d144076
Merge pull request #7462 from alalek:cpu_multi_target
2017-03-21 19:51:32 +00:00
Christof Kaufmann
583e3a6875
cmake: Avoid adding default path as system directory for GCC 6.x
...
This is a completion for PR #7390 and fixes #6517 and #815 .
2017-03-09 16:23:53 +01:00
Sergey
f743c82bdd
Updated OpenCVFindMKL.cmake
...
Current version of search for MLKROOT environment variable is wrong and should be corrected to (DEFINED ENV{MKLROOT})
2017-03-06 15:28:05 +03:00
Alexander Alekhin
05248a3dea
cmake: fix order of MKL libraries, don't pass additional libraries as modules
2017-02-15 17:13:13 +03:00
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
Alexander Alekhin
a2fed4c790
Merge pull request #8084 from mshabunin:libstdcplusplus-debug
2017-02-03 08:47:37 +00:00
Pavel Vlasov
9228a8bee6
Fixes IPP build on linux;
2017-01-31 16:39:09 +03:00
Maksim Shabunin
50d350bcd1
Enable GNU STL debug mode for debug builds
2017-01-31 12:36:26 +03:00
Alexander Alekhin
68e50661a2
cmake: fix CUDA flags generation
...
VTK uses parentheses in defines, so generated code is wrong:
set(nvcc_flags -m64;-D__OPENCV_BUILD=1;-DvtkRenderingContext2D_AUTOINIT=1(vtkRenderingContextOpenGL);...)
2017-01-23 18:45:53 +03:00
Alexander Alekhin
f1adc32765
cmake: fix support of duplicated file names in static libraries
2017-01-23 18:45:53 +03:00
Alexander Alekhin
a5d16f09e6
cmake world: allow to build python bindings
2017-01-23 18:45:53 +03:00
Alexander Alekhin
36b34465a4
cmake: include contrib modules into opencv_world
2017-01-23 18:45:53 +03:00
Alexander Alekhin
dc1502ad71
Merge pull request #8001 from alalek:c_defines
2017-01-20 17:52:24 +00:00
Dal Rupnik
e71ff78f7f
Merge pull request #8009 from Legoless:master
...
CMake: Building Dynamic Framework on iOS (#8009 )
* Updated python script with dynamic parameter
Updated python script to build static library by default
Updated python script to include bitcode flag
Added bitcode flag to c flags
Fixed directories and targets with static
Bitcode parameter fixed
Fixed script for static library
Fixed parameters in build function
Updated cmake common toolchain
Added changes to OpenCV Utils
Updates to cmake
Added cache internal
Updates to common toolchain
Fixed path in framework destination and added UIKit dependency
Dynamic plist for framework
Lib version removed hardcoded value
Removed trailing whitespace in toolchain
* Removed trailing whitespace
* Fixed typo in comment
* Renamed bitcode variable to bitcodedisabled
* Fixed target device family
2017-01-20 19:16:01 +03:00
Alexander Alekhin
f9828cd0c9
cmake: fix MKL detection in case of unsupported versions
...
CMake should not fail.
2017-01-19 13:33:39 +03:00
Alexander Alekhin
2b44c0b649
cmake: fix lapack
...
- added compile check with multiple tries for different configurations
- restored find_package(LAPACK)
- avoided modification of OPENCV_LINKER_LIBS
2017-01-17 15:56:42 +03:00
Alexander Alekhin
b7630a088b
cmake: add global defines to enable useful macros
2017-01-13 14:30:19 +03:00
Vladislav Sovrasov
7e99911c82
Fix MKL x86 detection on Windows
2017-01-11 17:18:21 +03:00
Vadim Pisarevsky
0bd68671bd
restored OpenBLAS detection; fixed MKL's lapack header ( #7921 )
2016-12-23 15:40:51 +03:00
Vadim Pisarevsky
ad74fdd7cc
moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository ( #7918 )
...
* moved BLAS/LAPACK detection scripts from opencv_contrib/dnn to the main repository.
* trying to fix the bug with undefined symbols sgesdd_ and dgesdd_
* removed extra whitespaces; disabled LAPACK on IOS
2016-12-22 22:57:44 +03:00
Alexander Alekhin
ccd32f6608
Merge pull request #7897 from alalek:fix_ffmpeg_check
...
cmake: fix ffmpeg check code (port into master #7893 )
2016-12-19 16:18:49 +02:00
Alexander Alekhin
7a95e654eb
ocl: update compiled programs
...
- minimize library initialization time (lazy calculations of program hash)
- LRU cache of in-memory compiled programs
2016-12-19 17:17:20 +03:00
Alexander Alekhin
3e1695d6e3
cmake: fix ffmpeg check code
2016-12-19 17:05:30 +03:00
Alexander Alekhin
2638abe12b
Merge pull request #7694 from sergiud:cmake-config-optional-components
2016-12-19 13:53:36 +00:00
Alexander Alekhin
35308bc45f
cmake: fix CMake error
...
"install DIRECTORY does not allow "COMPONENT" after PATTERN or REGEX."
2016-12-19 14:58:56 +03:00
Sergiu Deitsch
d71ec0cd1d
cmake: support OPTIONAL_COMPONENTS in OpenCVConfig.cmake
...
find_package allows to specify optional components. This way, the
command will not fail if any of the components marked as optional was
not found. This is useful in cases where components such as xfeatures2d,
viz etc. are not available either because they were not compiled by the
user or package maintainers decided to not provide the packages at all.
The user can check the availability of the optional component using the
OpenCV_<component>_FOUND variable.
2016-12-19 00:15:51 +03:00
Alexander Alekhin
0e4dde1781
Merge pull request #7872 from alalek:merge-2.4
2016-12-16 16:03:14 +02:00
Alexander Alekhin
ceb5210bfb
build: eliminate ICC PCH warning
2016-12-15 15:58:16 +03:00
Alexander Alekhin
dbbbad40fb
build: eliminate ICC warnings
2016-12-15 15:57:40 +03:00
Alexander Alekhin
540ece74a5
cmake: support ICC warnings
2016-12-15 15:57:27 +03:00
Alexander Alekhin
3fc06f14d4
cmake: use -fp-model precise with ICC
2016-12-15 15:56:31 +03:00
Patrik Huber
bd0a8c7e3f
Added VS2017 support (MSVC 1910)
2016-12-06 00:04:24 +00:00
Alexander Alekhin
0724d13bcd
build: cuda warnings
2016-12-04 03:10:05 +03:00
Alexander Alekhin
3ae1990727
Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup
2016-12-01 20:24:05 +00:00
Vadim Pisarevsky
5e75503fc2
Merge pull request #7750 from alalek:ts_find_or_skip
2016-12-01 18:10:18 +00:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Vadim Pisarevsky
817a17b218
Merge pull request #7767 from mshabunin:icl-support
2016-12-01 16:30:42 +00:00
Maksim Shabunin
19959cbfc9
Fixed Intel C++ 17 build in VS2015
2016-12-01 18:02:50 +03:00
mshabunin
695c518384
Updated TBB search script and code checks
2016-12-01 16:58:38 +03:00
Alexander Alekhin
71b2409df0
ts: added findDataFile() utility function and SkipTestException
2016-11-29 23:17:39 +03:00
Alexander Alekhin
14d2046f80
cmake: ccache
2016-11-18 15:09:44 +03:00
Alexander Alekhin
04ddbf565e
cmake: eliminate configuration warnings
2016-11-10 18:36:07 +03:00
Alexander Alekhin
ecac70f120
Merge pull request #7531 from dtmoodie:cmake_updates
2016-10-22 16:13:11 +00:00
Arek
e77bc24b96
Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status
...
Aravis several updates
* Fix adressing camera with id=0
* Aravis buffer property control & status added
* Modify of autoexposure algorith, ream frame ID from aravis + new properites
* Change of macro name
* VideoCapture now returns no frame on camera disconnecion
* Allow aravis-0.4 usage, proper camera object release.
2016-10-22 19:07:55 +03:00
Dan
8842b9b2b2
Newer versions of gstreamer use a slightly different include path on windows.
...
Newer versions of VTK have moved some of the reader objects into vtkIOGeometry.
2016-10-20 11:02:18 -04:00
Alexander Alekhin
e2e1485373
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities
2016-10-15 09:19:22 +00:00
Alexander Alekhin
d1e8651aae
ios: disable IPPICV on i386-iPhoneSimulator
2016-10-15 03:29:21 +03:00
StevenPuttemans
fa32abe5f3
add 5.2 and 6.1 compute capability support
2016-10-14 10:14:12 +02:00
Alexander Alekhin
4c8d25878b
cmake: update configuration for iOS
2016-10-12 23:43:29 +03:00
Vadim Pisarevsky
4acda3f609
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
2016-10-12 19:38:25 +00:00
Alexander Alekhin
6cfe4a85f7
cmake: fix ocv_check_compiler_flag
2016-10-08 02:19:43 +03:00
ArkadiuszRaj
70c12e5407
Basic support for GigE cameras via Aravis SDK
2016-10-07 21:55:49 +02:00
Noel Eck
d6bcab3c7b
doc: Small change to documentation in DectectPython.cmake
...
Fixed small typo for python 3 default version.
Signed-off-by: Noel Eck <noel.eck@intel.com>
2016-10-05 16:52:28 -07:00
Alexander Alekhin
b640e72877
cmake: update PCH
...
1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS
2016-10-04 19:41:28 +03:00
mshabunin
81938af5d0
Added support for OpenVX 1.0, updated cmake part, minor fixes
2016-10-04 15:31:54 +03:00
Alexander Alekhin
21d9412c93
cmake: fix for GCC 6.x
2016-10-03 19:39:04 +03:00
Alexander Alekhin
a3f74aaaaf
cmake: repair GCC PCH
2016-09-30 23:37:43 +03:00
Alexander Alekhin
d34f2cfefe
Merge pull request #7317 from tomoaki0705:fixIfdefFp16
2016-09-26 10:59:32 +00:00
Tomoaki Teshima
c7cb116dc0
check FP16 build condition correctly
...
* use __GNUC_MINOR__ in correct place to check the version of GCC
* check processor support of FP16 at run time
* check compiler support of FP16 and pass correct compiler option
* rely on ENABLE_AVX on gcc since AVX is generated when mf16c is passed
* guard correctly using ifdef in case of various configuration
* use v_float16x4 correctly by including the right header file
2016-09-23 11:04:22 +09:00
Jeroen Kromwijk
401537ebab
Detect the correct Python major version
2016-09-18 12:02:33 +02:00
Vadim Pisarevsky
dc3d0cbc22
Merge pull request #7266 from alalek:pr7159
2016-09-16 21:18:26 +00:00
Vadim Pisarevsky
6a1e549ffe
Merge pull request #7217 from thiell:master
2016-09-14 12:08:45 +00:00
Alexander Alekhin
f85e33f4af
videoio: refactor AVFoundation code integration
2016-09-09 17:42:41 +03:00
Alexander Alekhin
d855608e6e
instrumentation: fix build on Linux
...
- enable C++11
- fix macro
2016-09-08 16:13:46 +03:00
Alexander Alekhin
10d18a315c
instrumentation: minor refactoring, wrap OpenCL
...
- calculate ticksTotal instead of ticksMean
- local / global width is based on ticksTotal value
- added instrumentation for OpenCL program compilation
- added instrumentation for OpenCL kernel execution
2016-09-08 16:13:44 +03:00
Alexander Alekhin
d102ea96c0
Merge pull request #7210 from mshabunin:fix-warnings
2016-09-02 12:50:45 +00:00
Stephane Thiell
3335963987
cmake: add support for Nvidia GPU Tesla K80
2016-09-01 12:07:32 -07:00
Maksim Shabunin
dc704d77ac
Fixed several GCC 5.x warnings
2016-09-01 15:44:01 +03:00
Alexander Alekhin
a986db56c6
cmake: update matlab path
2016-09-01 15:17:32 +03:00
Alexander Alekhin
da0e07bc1b
Merge pull request #7177 from alalek:msvs_layout
2016-08-29 09:36:49 +00:00
Alexander Alekhin
db6d94a7b0
cmake: minimize MSVS projects layout
...
Also put "object" targets to off by default (they doesn't work well)
2016-08-26 13:40:16 +03:00
Maksim Shabunin
ae3dfa80db
OpenVX HAL
2016-08-25 16:08:45 +03:00
yoffy
767780a4b2
add VideoCapture / VideoWriter AVFoundation implementation for Mac
2016-08-23 10:51:58 -07:00
Alexander Alekhin
93e5947f55
Merge pull request #7101 from lupustr3:pvlasov/instrumentation
2016-08-18 14:56:41 +00:00
Vadim Pisarevsky
9e6575428d
Merge pull request #7111 from sovrasov:mkl_lapack
2016-08-18 13:05:26 +00:00
Alexander Alekhin
fde4e8fed9
cmake: add /usr/local/lib on Apple platform
2016-08-17 18:04:06 +03:00
Pavel Vlasov
a462d76a95
Implementations instrumentation framework for OpenCV performance system;
2016-08-17 16:26:03 +03:00
Sovrasov
a3b4d4608d
Static Lapack linkage
2016-08-17 11:33:09 +03:00
Vladislav Sovrasov
a113d9bcc1
Add MKL support
2016-08-10 11:20:23 +03:00
Alexander Alekhin
18e7afdfd9
cmake: add OPENCV_ENABLE_NONFREE option and macro
2016-08-04 19:23:49 +03:00
Alexander Alekhin
2ec63e4dd1
fix android pack build
2016-07-20 16:49:57 +03:00
Alexander Alekhin
22919c39ad
Merge pull request #6950 from tomoaki0705:fixMf16cBuildError
2016-07-19 11:53:28 +00:00
Tomoaki Teshima
d5179b8218
let the test Video_AccSquared.accuracy pass on linux x64 debug
2016-07-19 18:29:37 +09:00
Vadim Pisarevsky
b6f21a6cac
Merge pull request #6813 from mshabunin:gdcm-cmake-search
2016-07-18 16:00:43 +00:00
Vadim Pisarevsky
48b747903b
Merge pull request #6830 from tomoaki0705:featureSupportFp16
2016-07-18 15:56:00 +00:00
Maksim Shabunin
63d8290491
Merge pull request #6779 from alalek:python_dynamic_lookup
2016-07-15 12:28:30 +00:00
Vladislav Vinogradov
d76f258aeb
update CUDA architecture flags initialization
...
* remove obsolete paths
* add Pascal arch support
2016-07-13 13:03:16 +03:00
Vladislav Vinogradov
112903c2bd
increase minimal supported CUDA toolkit to 6.5
2016-07-13 13:02:13 +03:00
Alexander Alekhin
7176c1327e
Merge pull request #6850 from alalek:bigdata_test
2016-07-11 14:01:06 +00:00
Alexander Alekhin
5f269d08b4
bigdata: add test, resolve split/merge issue
2016-07-08 18:05:53 +03:00
look4pritam
6f22f49c02
Grassroots DiCoM i.e. GDCM based DICOM image reader is added.
2016-07-08 16:08:55 +03:00