Maksim Shabunin
2df0345985
cmake: add download helper scripts
2018-08-01 15:57:53 +03:00
Alexander Alekhin
47e3e89e30
Merge pull request #12116 from luzpaz:misc-typos
2018-08-01 11:35:57 +00:00
Alexander Alekhin
3f302cabb8
core(test): intrinsic tests for all dispatched CPU optimizations
...
- tests for both SIMD128 / SIMD256
- different dispatched + baseline(SIMD128) intrinsics
2018-08-01 13:50:42 +03:00
Alexander Alekhin
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
Maksim Shabunin
5aceee5a36
Restored tests dependencies processing
2018-07-31 19:34:19 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Maksim Shabunin
7cf52de47e
dnn: modified IE search, R2 compatibility fixed
2018-07-31 14:48:06 +03:00
Maksim Shabunin
597db69151
ts: test case list is printed after cmd line parsing, refactored
2018-07-26 16:43:43 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Dmitry Kurtaev
0c4d5ffecd
Do not copy cv_cpu_helper.h to parent if OpenCV is a submodule
2018-07-24 09:36:28 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
5b72e83687
cmake: prefer using find_package(InferenceEngine)
2018-07-17 15:31:11 +03:00
Alexander Alekhin
60994389a6
Merge pull request #11985 from alalek:cmake_update_inference_engine_detection
2018-07-16 15:49:19 +00:00
Alexander Alekhin
014ae55379
cmake: update DL IE detection to align with OpenVINO 2018 R2
...
These CMake options are enough:
- `-DWITH_INF_ENGINE=ON`
- `-DIE_PLUGINS_PATH=lib/ubuntu_16.04/intel64`
- `-DENABLE_CXX11=ON` (OpenCV 3.4 only)
2018-07-16 14:02:23 +03:00
Alexander Alekhin
e79c729b20
CUDA: allow to use external FindCUDA from modern CMake
...
CMake 3.9.0+ is required
2018-07-12 14:33:14 +03:00
Alexander Alekhin
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +03:00
Kuang Fangjun
8e24a8b7c0
remove a redundant option.
2018-07-02 09:45:28 +08:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Pavel Rojtberg
bfc227b8d4
videoio: update librealsense to API 2.0
...
this enables the usage of current sensors, while dropping support for
legacy devices, see:
https://github.com/IntelRealSense/librealsense#overview
Given limited resources, and that the legacy sensors where not that
great, I think we should focus on v2.
2018-06-08 18:23:00 +02:00
Alexander Alekhin
dd7f88bd68
python: support standalone Python bindings build
...
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
2018-06-07 15:16:39 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Alexander Alekhin
ec30b1294f
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package
2018-06-04 14:37:36 +00:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08:00
Alexander Alekhin
b934702c7f
cmake: support find_package(FFMPEG)
...
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
2018-05-31 18:27:01 +03:00
Dmitry Kurtaev
f96f934426
Update Intel's Inference Engine deep learning backend ( #11587 )
...
* Update Intel's Inference Engine deep learning backend
* Remove cpu_extension dependency
* Update Darknet accuracy tests
2018-05-31 14:05:21 +03:00
Alexander Alekhin
5e68f35500
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-22 19:02:01 +03:00
Alexander Enaldiev
84584002f2
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
...
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)
* imgcodecs: fixes
- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
2018-05-22 15:10:15 +00:00
Alexander Alekhin
573e790107
Merge pull request #11558 from alalek:issue_11552
2018-05-22 14:19:13 +00:00
Maksim Shabunin
020ad1ac76
dnn: allow setting IE paths via command line
2018-05-22 14:40:03 +03:00
Alexander Alekhin
ba1bd64bf9
Merge pull request #11532 from paroj:realsense
2018-05-21 15:59:46 +00:00
Alexander Alekhin
d4a8a9ee96
cmake: filter NVCC compiler flags (Wimplicit-fallthrough, OPENCV_CUDA_NVCC_FILTEROUT_OPTIONS)
...
issue 11552
2018-05-21 17:54:11 +03:00
Pavel Rojtberg
936d2963a2
videoio: add rudimentary librealsense 1.x support
...
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
2018-05-17 11:56:52 +02:00
Alexander Alekhin
68c92908d5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-14 15:17:35 +03:00
Alexander Alekhin
c6a9de812b
Merge pull request #11497 from alalek:libjpeg-turbo
2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
2018-05-11 18:29:57 +03:00
Alexander Alekhin
43177b1f6f
cmake: added check_flake8 target
2018-05-11 17:32:22 +03:00
Alexander Alekhin
000a13b6a3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-03 14:30:38 +00:00
Sayed Adel
788d6a7105
cmake: Disable -Wsuggest-override option in case of using PCH #11433
2018-05-02 09:12:55 +00:00
Alexander Alekhin
80934dc488
cmake: update 'git describe' information
2018-04-28 17:17:31 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera
2018-04-27 19:34:29 +03:00
Alexander Alekhin
1031dfe4e8
Merge pull request #11402 from alalek:build_warnings
2018-04-26 19:04:37 +00:00
Alexander Alekhin
56222f35bb
cmake: fix CPU_BASELINE_FINAL filling
...
- remove duplicates
- restore "always on" missing entries
- fix FP16 detection on MSVC
2018-04-26 17:13:42 +03:00
Alexander Alekhin
2a330e3006
cuda: eliminate warnings
2018-04-26 15:06:59 +03:00
Alexander Enaldiev
677dc802ae
protobuf build documenting: move the WITH_PROTOBUF option to the top level
2018-04-26 13:58:13 +03:00
Alexander Alekhin
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
Alexander Alekhin
ef2548778c
build: -Wimplicit-fallthrough warning for GCC 7+ only
2018-04-24 16:03:40 +03:00
Vitaly Tuzov
80600e5cdc
Added DXVA hardware acceleration to MSMF-based VideoCapture
2018-04-24 13:42:49 +03:00
Alexander Alekhin
a2d6fc7ac0
cmake: fix popcnt detection
...
via GCC/Clang __POPCNT__ define
2018-04-24 12:40:25 +03:00
Alexander Alekhin
ff6ce6cd01
cmake: change CPU_BASELINE=DETECT for MacOSX
2018-04-23 19:42:49 +03:00
Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Alexander Alekhin
dca9ca1cac
Merge pull request #11363 from mshabunin:compat-vc2017
2018-04-23 09:24:39 +00:00
Alexander Alekhin
29b4fd2774
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
2018-04-23 09:16:39 +00:00
Maksim Shabunin
abce51fb7b
cmake config: adding fallback to VS 2015 if distribution does not have VS 2017 binaries
2018-04-23 09:33:27 +03:00
Dmitry Kurtaev
bd77d100e1
Enable some tests for clDNN plugin from Intel's Inference Engine
2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
97882d03cc
core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option
...
Reproducer:
cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
2018-04-18 14:13:03 +03:00
Alexander Alekhin
5b867b6f1f
cmake: fix CPU_BASELINE=NATIVE on MSVS
2018-04-17 19:34:35 +03:00
Alexander Alekhin
4b2d1aaeea
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-16 12:41:47 +03:00
Alexander Alekhin
a2d6ee2d31
Merge pull request #11305 from tomoaki0705:typoNVIDIA
2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a40354d16f
use correct name for NVIDIA
...
* remove NVidia and Nvidia
* replace Cuda with CUDA
* keep the letters for API
2018-04-13 20:33:19 +09:00
Tomoaki Teshima
779a42678d
fix CUDA build crash
...
* add --std=c++11 flag to nvcc definition
* remove not used abs functions
2018-04-11 17:19:09 +09:00
Alexander Alekhin
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
Alexander Alekhin
250941bd47
next: drop WITH_CSTRIPES
2018-04-10 18:09:54 +03:00
Alexander Alekhin
d4688e6474
cmake: require C++11 and CMake 3.5.1+
2018-04-10 18:09:54 +03:00
Vladislav Sovrasov
e7e29cb63c
cmake: add compilation test for VTK
2018-04-10 18:09:54 +03:00
Alexander Alekhin
73f4907dc0
Merge pull request #11280 from alalek:fix_cmake_warning_ninja_pylintrc
2018-04-10 14:36:12 +00:00
Alexander Alekhin
333973b846
Merge pull request #11276 from alalek:install_pdb
2018-04-10 14:35:32 +00:00
Alexander Alekhin
5e03011496
cmake: fix Ninja generator warning about pylintrc
...
CMake generated files is a part of target depends list.
Details: `cmake --help-policy CMP0058`
2018-04-10 12:23:10 +03:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
Alexander Alekhin
784c8436fd
cmake: update PDB installation
2018-04-09 18:50:58 +03:00
Vladislav Sovrasov
0d9c63744e
Add CPU default extensions loading in IE dnn backend ( #11252 )
...
* Add CPU default extensions loading in IE dnn backend
* Load cpu_extensions for the future Intel's Inference Engine
2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
29869c5b91
Merge pull request #11243 from alalek:with_cuda_default_off
2018-04-09 09:46:34 +00:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
Alexander Alekhin
4990506948
cuda: WITH_CUDA=OFF by default (need to enable it explicitly)
2018-04-05 19:23:58 +00:00
Alexander Alekhin
6abfc6761e
android: refactor Android SDK detection
...
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
2018-04-05 19:19:31 +00:00
Alexander Alekhin
87498bc6d4
cmake: workaround CPATH ipp_iw issue
...
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
2018-03-28 18:43:28 +03:00
Alexander Alekhin
0ede1b5b22
cmake: enable override warnings (requires C++11 compilation mode)
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1
cmake: disable checks for protobuf generated files
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6bd80ba71b
cmake: use SYSTEM include directories
2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04
Merge pull request #11098 from dkurt:dnn_native_inf_engine
2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
2f3a9ba1d4
Update OpenCVDetectInferenceEngine.cmake
2018-03-28 16:34:37 +03:00
Alexander Alekhin
8388b630ac
Merge pull request #11167 from alalek:cmake_compiler_vars
2018-03-28 12:38:31 +00:00
Alexander Alekhin
5da7805623
cmake: add module/src include dir in case of enabled precompiled headers
2018-03-27 17:38:54 +03:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Alexander Alekhin
6c051a55e5
cmake: don't add include <module>/src directory to avoid conflicts
...
during opencv_world builds
2018-03-19 11:14:15 +03:00
Alexander Alekhin
47dea29e4e
Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies
2018-03-16 16:32:49 +00:00
Alexander Alekhin
1e808a495d
cmake: fix android examples dependencies
...
add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.
2018-03-15 14:17:02 +03:00
Sonny Kurniawan
c11eaeec49
Help Cmake find OpenNI2 include path
...
When compiling with OpenNI2 flag active, CMake will not be able to find OpenNI.h due to the environment path not set in OpenCVFindOpenNI2.cmake. This PR rectifies this issue.
2018-03-15 18:39:07 +09:00
jchazalon
bf5f7380cf
Update OpenCVDownload.cmake to fix log crash
...
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.
More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
2018-03-07 15:35:37 +01:00
Alexander Alekhin
514f4193db
Merge pull request #10959 from alalek:cmake_ocl4dnn
2018-03-07 10:26:14 +00:00
Maksim Shabunin
7bbe002a2f
Add install component for 3rdparty libraries licenses
2018-03-06 16:32:30 +03:00
Alexander Alekhin
560ca8c5aa
Merge pull request #10961 from alalek:fix_clang_avx512
2018-03-02 11:36:57 +00:00
Alexander Alekhin
1b83bc48a1
dnn: make OpenCL DNN code optional
2018-03-01 12:12:40 +03:00
Alexander Alekhin
0b4428e92f
cmake: AVX512 with clang
2018-02-27 15:46:09 +03:00
Maksim Shabunin
f0c0e0c6fa
CPU dispatching: additional AVX-512 check for mingw-w64
2018-02-25 15:12:53 +03:00
Maksim Shabunin
3fd2384b81
Fixed mingw compilation on Windows
2018-02-22 17:11:18 +03:00
Vadim Pisarevsky
88b689bcf1
Merge pull request #10876 from alalek:android_static_libs
2018-02-19 14:16:06 +00:00
Alexander Alekhin
ddb482b14a
android: move .a files into 'staticlibs' directory
...
to reduce overhead of gradle builds
2018-02-15 16:31:49 +03:00
Alexander Alekhin
36f11a54e1
cmake: customize OpenCV build via CMake script hooks
2018-02-15 14:03:38 +03:00
Alexander Alekhin
c434198ee5
Merge pull request #10864 from alalek:cmake_update_debug_info
2018-02-14 12:47:43 +00:00
Alexander Alekhin
95014f311d
cmake: debug info
2018-02-14 13:44:10 +03:00
Maksim Shabunin
2d1350a9d6
Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data'
2018-02-12 18:42:36 +03:00
Maksim Shabunin
2200e13c71
cmake: refactored scripts with samples building:
...
- allow installing samples sources on all platforms
even if BUILD_EXAMPLES is disabled, fixed minor
issues in sources installation process
- use 'example_<group>_<name>' scheme for target and binary file naming
- use single function for sample executable creation
2018-02-12 18:42:36 +03:00
Alexander Alekhin
14032c6653
cmake: reset __content variable if file doesn't exist
...
Resolves CMake error after relaunch with updated source code:
Cannot find source file:
modules/dnn/layers/layers_common.avx512_skx.cpp
2018-02-12 17:30:53 +03:00
Alexander Alekhin
5a791e6e06
cmake: update reporting of excluded dispatching files ( #10711 )
...
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
2018-02-12 14:48:20 +03:00
Vadim Pisarevsky
51b5fdba25
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
2018-02-12 11:40:00 +00:00
Alexander Alekhin
65ba2e0adf
cmake: update adding of extra compiler flags
...
Read flags from 'cache' instead of resetting them
2018-02-09 17:09:35 +03:00
Dmitry Kurtaev
7fe97376c2
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
2018-02-09 13:45:45 +03:00
Vadim Pisarevsky
0c07836fba
Merge pull request #10807 from luzpaz:misc-typos
2018-02-07 13:43:10 +00:00
luz.paz
413fba14ab
Some mist. typo fixes
...
Found via `codespell -i 3 -w --skip="./3rdparty" -I ../opencv-whitelist.txt`
2018-02-07 06:59:15 -05:00
Dmitry Kurtaev
ed94136548
OpenCV face detection network using Inference Engine backend
2018-02-06 17:53:24 +03:00
Dmitry Kurtaev
10e1de74d2
Intel Inference Engine deep learning backend ( #10608 )
...
* Intel Inference Engine deep learning backend.
* OpenFace network using Inference Engine backend
2018-02-06 11:57:35 +03:00
Alexander Alekhin
06455fc0cd
Merge pull request #10764 from sturkmen72:update_cmake
2018-02-05 14:07:40 +00:00
Suleyman TURKMEN
3b191bf2dd
update CMakeList.txt
2018-02-05 16:23:52 +03:00
Alexander Alekhin
19a914be16
Merge pull request #10759 from mshabunin:fix-msvc-lto-debug
2018-02-05 09:33:03 +00:00
Alexander Alekhin
e801e336ed
Merge pull request #10769 from mshabunin:add-tbb-cmake-support
2018-02-03 19:48:19 +00:00
Maksim Shabunin
108d07c655
TBB: added workaround for linking issue with conflicting system and custom libraries
2018-02-03 14:27:46 +03:00
Maksim Shabunin
34a9ce6eb3
cmake: support searching for TBB via cmake package mechanism
2018-02-03 13:51:54 +03:00
Alexander Alekhin
3d6659112f
cmake: fix includes processing
2018-02-02 21:52:54 +03:00
Alexander Alekhin
403c3c3d03
Merge pull request #10766 from mshabunin:fix-world-interface-include
2018-02-02 16:25:17 +00:00
Alexander Alekhin
877b175565
Merge pull request #10758 from mshabunin:allow-many-contrib
2018-02-02 16:07:48 +00:00
Maksim Shabunin
7eb37bd1dd
Fixed components INTERFACE_INCLUDE_DIRECTORY property in "world" builds
2018-02-02 18:14:25 +03:00
Alexander Alekhin
c96630c9f0
Merge pull request #10705 from alalek:opencv_version_update
2018-02-01 18:31:52 +00:00
Maksim Shabunin
60f1c9dcdf
Do not enable LTO flags for MSVC debug configuration
2018-02-01 19:22:48 +03:00
Maksim Shabunin
82aff110b7
cmake: allow providing list of extra modules paths
2018-02-01 19:02:02 +03:00
Maksim Shabunin
e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
Alexander Alekhin
01f4a173ab
opencv_version: dump OpenCL information via opencv_version
...
fix missing "opencv2/core/opencl" headers from core module (updated install list)
2018-01-27 17:08:28 +00:00
Alexander Alekhin
73891d619a
Merge pull request #10700 from alalek:cpu_dispatch_axv512
...
* cmake: enable CPU dispatching for AVX512 (SKX)
* cmake: update handling of unsupported flags/modes
2018-01-26 21:59:47 +03:00
Maksim Shabunin
3f116468c6
Merge pull request #10679 from mshabunin:vs-defense-flags
2018-01-25 09:57:43 +00:00
Maksim Shabunin
74367093c8
VS with hardening: added guard flag, moved dynamicbase and safeseh to linker flags
2018-01-24 17:59:10 +03:00
Alexander Alekhin
81c5fae56f
core(lapack): fix build issues related to 'extern "C"'
2018-01-24 14:53:04 +03:00
Maksim Shabunin
1b0ff57562
Merge pull request #10621 from mshabunin:disable-docs
...
Documentation generation refactoring (#10621 )
* Documentation build updates:
- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html
* javadoc: fix path in build directory
* cmake: fix "Documentation" status line
2018-01-18 16:37:19 +03:00
Alexander Alekhin
85e133a051
Merge pull request #10604 from aimotive:master
2018-01-17 09:40:42 +00:00
Csaba Keszegh
2aa18ca3e9
fix: use CXX_STANDARD when extracting compiler flags for PCH with GNUCXX
...
When compiling with cmake using -DCMAKE_CXX_STANDARD=11 use `-std=gnu++11`
for PCH compiler flags, otherwise it triggers an error:
opencv_core_Release.gch: not used because `__cplusplus' defined as ` 201103L' not ` 199711L' [-Winvalid-pch]
Use CXX_EXTENSIONS property to select `gnu++11` or `c++11`.
Trying to mimic cmake logic here: https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmLocalGenerator.cxx#L1527-1557
2018-01-16 20:32:21 +01:00
Maksim Shabunin
c0ae812aa2
Add ThinLTO support for clang
2018-01-16 15:26:28 +03:00
oqtvs
df0b83332d
Updated protobuf version to 3.5.1
2018-01-15 13:51:37 -02:00
Alexander Alekhin
91e10a3105
cmake: ocv_target_include_directories() handle SYSTEM directories
2018-01-13 02:12:39 +00:00
Alexander Alekhin
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
Alexander Alekhin
9deaddcdff
Merge pull request #10490 from alalek:cmake_android_refactor_copy_project_files
2018-01-12 12:23:37 +00:00
Alexander Alekhin
98b6e1d5fe
Merge pull request #10515 from alalek:android_ndk16
2018-01-12 12:22:40 +00:00
Aaron Bray
6f8be3f693
Merge pull request #10497 from aaron-bray:msvc2017-findcuda
...
* Update to properly find the compiler tools for MSVC 2017
* FindCUDA: Fix the MSVC 2017 compiler tool locations
2018-01-10 12:32:34 +03:00
Alexander Alekhin
f3dde79ed6
cmake: allow BUILD_FAT_JAVA_LIB for non-Android targets too
2018-01-08 19:24:39 +00:00
Alexander Alekhin
431b3b4323
cmake(android): refactor copying of Android samples project files
2018-01-05 17:32:27 +00:00
Alexander Alekhin
9966903ae1
cmake(android): fix non-idempotent INSTALL scripts
2018-01-05 17:19:37 +00:00
Alexander Alekhin
0e6dd32858
cmake(android): update zlib alias condition
...
To use 'z' in Android.mk instead of absolute path from the build machine.
2018-01-05 04:52:17 +00:00
Alexander Alekhin
bc7923e382
cmake(android): fix ccache detection (native Android toolchain with NDK_CCACHE)
...
To prevent this result:
/usr/bin/ccache ccache <android-ndk-r16.1>/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-gcc ...
with:
ccache: error: Recursive invocation (the name of the ccache binary must be "ccache")
2018-01-05 04:52:17 +00:00
Alexander Alekhin
5f9bb6249e
android: IPPICV static libraries workarounds for NDK 16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
94b236872c
cmake: avoid unnecessary files creation in ocv_cmake_configure()
2018-01-02 19:16:51 +00:00
Alexander Alekhin
ea5a3e557f
python: filter modules headers (from <module>/include directory)
2018-01-01 15:56:14 +00:00
Alexander Alekhin
4bd1e3dcbd
cmake: avoid timestamp change of version_string.inc file
2017-12-30 20:26:15 +00:00
Alexander Alekhin
7d67d60fb1
cmake(opt): AVX512_SKX
2017-12-29 07:18:11 +00:00
Alexander Alekhin
898ca38257
cmake: AVX512 -> AVX_512F
2017-12-28 15:20:27 +00:00
Arjan van de Ven
fc8e848a54
Add basic plumbing for AVX512 support
...
The opencv infrastructure mostly has the basics for supporting avx512 math functions,
but it wasn't hooked up (likely due to lack of users)
In order to compile the DNN functions for AVX512, a few things need to be hooked up
and this patch does that
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
2017-12-25 21:06:52 +00:00
Vadim Pisarevsky
9b659736da
Merge pull request #10394 from alalek:cmake_fix_pch_pic_pie
2017-12-22 13:26:32 +00:00
Alexander Alekhin
6c252d8cdc
cmake: fix -fPIC/-fPIE handling in precompiled headers (PCH)
2017-12-22 13:57:06 +03:00
Tomoaki Teshima
fe7b3f1228
clean up the code
...
* disable the warning in CMake, not int the code using pragma
2017-12-22 08:42:21 +09:00
Alexander Alekhin
0b33eb0929
cmake: fix ocv_target_compile_definitions() for world builds
...
fixes CUDA build
2017-12-15 23:30:53 +03:00
Sayed Adel
a8ae9cab08
3rdparty:libpng[1.6.34] Add missing support for PowerPC/VSX
2017-12-15 03:00:07 +00:00
Alexander Alekhin
6cedc82799
Merge pull request #10274 from alalek:update_3rdparty
2017-12-14 15:10:32 +00:00
Alexander Alekhin
cd4176104d
3rdparty: update libwebp 0.6.1
2017-12-14 14:49:31 +03:00
Alexander Alekhin
5c709f4aaa
3rdparty: update libtiff 4.0.9
2017-12-14 14:49:31 +03:00
Vadim Pisarevsky
a4b5eabccf
Merge pull request #10299 from alalek:cmake_imported_configuration_remap
2017-12-14 11:01:02 +00:00
Alexander Alekhin
f39ee9c6a1
cmake: rework MAP_IMPORTED_CONFIG to prevent unintended build failures
...
Introduce CMake variable OPENCV_MAP_IMPORTED_CONFIG which controls this behaviour
Added defaults for MSVS targets
2017-12-13 14:30:27 +03:00
Alexander Alekhin
edadcfa7d9
cmake: add option to workaround issue observed with old CMake
...
CMake message contains this: "Invalid escape sequence \"
2017-12-12 19:00:42 +03:00
Alexander Alekhin
5404930112
Merge pull request #9260 from Cartucho:add_python_signatures
2017-12-12 08:58:14 +00:00
Maksim Shabunin
7349b8f5ce
Build for embedded systems
2017-12-11 13:27:37 +03:00
Alexander Alekhin
768f4cb7bc
python: 'sub-module' for binding sources and documentation meta information
2017-12-09 21:01:46 +00:00
Maksim Shabunin
38c62f6461
Added option to disable gc-sections flag
2017-12-07 10:28:58 +03:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +03:00
Vadim Pisarevsky
b833d512ec
fixed native Lapack detection script on Mac/iOS (where native Lapack is a part of Accelerate framework)
2017-12-05 15:45:37 +03:00
Alexander Alekhin
22c0bb7dc9
cmake: fix WITH_VTK usage
...
'WITH_' variables is intended to enable CMake scripts with some autodetection logic.
'WITH_' can be off, but components is really enabled via command-line options
with proper variables setup (including 'HAVE_').
2017-11-29 21:43:09 +03:00
Maksim Shabunin
7eb1065944
Fixed/disabled warnings produced by GCC 7
2017-11-29 17:21:22 +03:00
Alexander Alekhin
f7913e2c84
build: eliminate Xcode 9.1 warnings
...
- 3rdparty/libjasper/jas_getopt.c:129:25: warning: this function declaration is not a prototype [-Wstrict-prototypes]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument]
2017-11-28 17:48:40 +03:00
Alexander Alekhin
89d855c0b7
cmake: update optimization filter
2017-11-27 18:18:19 +03:00
Alexander Alekhin
5d369afe27
Merge pull request #9893 from mshabunin:add-modules-whitelist
2017-11-23 15:09:35 +00:00
Maksim Shabunin
5b17410f7c
Added BUILD_LIST feature
2017-11-23 16:06:21 +03:00
Alexander Alekhin
f6d927ef3b
dnn: avoid conflicts with original caffe.proto
...
rename caffe.proto => opencv-caffe.proto
2017-11-20 19:04:00 +03:00
Maksim Shabunin
5ebb234746
cmake: simplified configuration output
2017-11-17 11:57:49 +03:00
Amro
bbba9ac121
fix pkg-config generation for mingw
2017-11-15 18:54:46 +02:00
Alexander Alekhin
43e4e1b624
cmake: drop amending of compilation options
...
Allow to specify optimization level via CMake.
2017-11-12 11:12:27 +03:00
Alexander Alekhin
a0e1def83b
cmake: fix pkg-config generation for MacOSX
2017-11-08 16:06:48 +03:00
Alexander Alekhin
8e21f808be
cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values
2017-11-07 13:55:13 +03:00
Alexander Alekhin
ac22d3c817
cmake: MSVC_VERSION use pattern matching
2017-11-07 13:52:06 +03:00
Mikhail Paulyshka
62737c777c
cmake: add support for MSVS 2017 update 5
2017-11-04 23:52:37 +03:00
Maksim Shabunin
93813fec6e
VisualStudio: Added solution folders for dispatched optimization targets
2017-10-30 18:30:20 +03:00
Alexander Alekhin
5f80e42dac
cmake: update OpenBLAS support
...
- reorder path HINTS to avoid conflicts with other LAPACK libraries
- add extern "C" { } to avoid generation of C++ symbols
2017-10-28 10:17:37 +03:00
Alexander Alekhin
60cbc46da1
Merge pull request #9886 from mshabunin:remove-cmake-submodules
2017-10-27 11:23:19 +00:00
Alexander Alekhin
db980b0eca
cmake: fix '-fvisibility' options regression
...
CMAKE_COMPILER_ID => CMAKE_CXX_COMPILER_ID
2017-10-23 12:18:52 +03:00
Maksim Shabunin
b1fe298764
Removed cmake submodules and contrib_world references
2017-10-19 17:34:59 +03:00
Gregory Morse
d30a0c6f03
Merge pull request #9856 from GregoryMorse:patch-1
...
* Update OpenCVCompilerOptimizations.cmake
Neon not supported on MSVC ARM breaking build fix
* Update OpenCVCompilerOptimizations.cmake
Whitespace
* Update intrin.hpp
Many problems in MSVC ARM builds (at least on VS2017) being fixed in this PR now.
C:\Users\Gregory\DOCUME~1\MYLIBR~1\OPENCV~3\opencv\sources\modules\core\include\opencv2/core/hal/intrin.hpp(444): error C3861: '_tzcnt_u32': identifier not found
* Update hal_replacement.hpp
Passing variadic expansion in a macro to another macro does not work properly in MSVC and a famous known workaround is hereby applied. Discussion of it: https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
Only needed the fix for ARM builds: TEGRA_ macros are used for cv_hal_ functions in the carotene library.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): warning C4003: not enough actual parameters for macro 'TEGRA_ADD'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2143: syntax error: missing ')' before ','
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2059: syntax error: ')'
* Update hal_replacement.hpp
All hal_replacement's using carotene\hal\tegra_hal.hpp TEGRA_ functions as macros preprocessed by variadic macros should be changed, identical as was done in core.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): warning C4003: not enough actual parameters for macro 'TEGRA_CVTBGRTOBGR'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): error C2059: syntax error: '=='
* Update OpenCVCompilerOptimizations.cmake
* Update hal_replacement.hpp
* Update hal_replacement.hpp
2017-10-16 12:12:35 +03:00
Alexander Alekhin
23f26fb4a8
cmake: fix LAPACK/MKL detection
2017-10-13 15:40:37 +03:00
Maksim Shabunin
1ba29cc95d
Merge pull request #9834 from mshabunin:mediasdk-win-support
2017-10-12 12:08:54 +00:00
Maksim Shabunin
83655ba9be
MediaSDK video backend: Windows support
2017-10-11 16:33:37 +03:00
Pavel Vlasov
a972f0d4ea
Standalone IPP with IW fix;
2017-10-11 15:30:01 +03:00
Vadim Pisarevsky
638a91f92f
Merge pull request #9822 from alalek:fix_tbb_search
2017-10-10 14:22:00 +00:00
Alexander Alekhin
25161fc56f
tbb: don't search library in ENV{LD_LIBRARY_PATH}
...
ENV{LIBRARY_PATH} is enough
2017-10-10 14:18:28 +03:00
Sayed Adel
d077778074
Added support for VSX
2017-10-09 00:32:29 +00:00
Suleyman TURKMEN
a13cbced2e
Update OpenCVFindLibsGrfmt.cmake
2017-09-30 21:39:50 +03:00
bradford barr
a56d7592f0
TBB Debug Release
...
OpenCV fails to detect tbb on a debug build if the platform has only installed
debug libraries. This PR adds an additional check to the tbb detect logic for
systems that only install tbb debug and not both tbb debug and release.
2017-09-28 17:31:41 -04:00
Alexander Alekhin
587df6d942
cmake: fix typo
2017-09-26 17:19:27 +03:00
Alexander Alekhin
b143f7100a
Merge pull request #9505 from cbalint13:cuda
...
Enable CUDA_NVCC_FLAGS at arch detect step.
2017-09-25 14:05:41 +03:00
jodrescher
50b651655d
Update OpenCVDownload.cmake unpack
...
Added new "f" flag to the tar unpack, because without it doesn't complete, an compile fails
2017-09-21 14:00:43 +02:00
Alexander Alekhin
3b993431be
cmake: fix build process of OpenCL kernels
2017-09-20 18:10:31 +03:00
Alexander Alekhin
c57aef75de
Merge pull request #9647 from alalek:cmake_ipp_absolute_path
2017-09-20 12:56:33 +00:00
joncrall
a936ec325b
Added warning when MSVC_VERSION is not recognized
2017-09-19 18:00:25 -04:00
Benoit Blanchon
2d0611bc01
cmake: map RelWithDebInfo and MinSizeRel configuration to Release
2017-09-18 17:47:49 +02:00
Alexander Alekhin
6757101f55
cmake/IPP: use absolute path
2017-09-17 23:12:59 +03:00
Vladislav Sovrasov
32bf712102
cmake: disable implicit-fallthrough by default
2017-09-11 16:04:00 +03:00
Maksim Shabunin
2ac57a2b1f
Merge pull request #9457 from alalek:type_traits_issue_7599
2017-09-06 13:34:29 +00:00
Alexander Alekhin
164a41b399
fix CUDA build
...
CUDA implementation wants to convert std::vector<KeyPoint> <-> GpuMat.
There is no direct mapping from KeyPoint (mix of int/float fields)
into cv::Mat element type, so this conversion must be avoided.
Legacy mode is turned back for CUDA builds.
2017-09-04 14:41:29 +03:00
Alexander Alekhin
3df41b3263
Merge pull request #9426 from borisfom:dispatch
2017-09-03 09:24:59 +00:00
Alexander Alekhin
146be78390
cmake: cl2cpp change main OUTPUT to .hpp file
...
To reduce number of unnecessary rebuilds on updates of OpenCL kernels
2017-09-01 08:24:59 +03:00
Balint Cristian
0c4e294504
Enable CUDA_NVCC_FLAGS at arch detect step.
2017-08-31 12:57:43 +03:00
Alexander Alekhin
034aaa7a70
Merge pull request #9465 from tomoaki0705:fixJetsonTK1Build
2017-08-29 11:46:10 +00:00
Tomoaki Teshima
6531fd142c
fix build error on Jetson TK1
...
* guard correctly in header file
* guard correctly in cmake file
2017-08-29 19:05:13 +09:00
Alexander Alekhin
537ab13842
cmake: fix Pylint version detection
2017-08-28 19:03:44 +03:00
Alexander Alekhin
d195f2775a
cmake: change Pylint integration
2017-08-24 14:59:33 +03:00
tribta
b7fa6d84bc
Using Pylint Tool to Test the python tutorial codes
...
* Adding CMake script to check if pylint is installed
* Adding Pylint config file (to choose the tests that are enabled)
* Adding CMake script to samples/python/tutorial_code
Testing: bad-indentation, mixed-indentation, unnecessary-semicolon, unused-variable
2017-08-24 14:58:48 +03:00
Alexander Alekhin
9c14a2f0aa
Merge pull request #9395 from lupustr3:pvlasov/icv2017u3_update
2017-08-24 11:48:53 +00:00
Boris Fomitchev
c48807c383
Merge pull request #9418 from borisfom:cuda9
...
CUDA9 build fixed, added detection (#9418 )
* CUDA9 build fixed, added detection
* Replacing deprecated __shfl_xxx with __shfl_sync, fixing bogus CUDA9 warnings
2017-08-24 07:11:44 +00:00
Pavel Vlasov
a57718e1ac
ICV2017u3 package update;
...
- Optimizations set change. Now IPP integrations will provide code for SSE42, AVX2 and AVX512 (SKX) CPUs only. For HW below SSE42 IPP code is disabled.
- Performance regressions fixes for IPP code paths;
- cv::boxFilter integration improvement;
- cv::filter2D integration improvement;
2017-08-23 14:24:43 +03:00
Alexander Alekhin
a710317aa0
Merge pull request #9421 from csukuangfj:fix-doc
2017-08-22 20:51:49 +00:00
Boris Fomitchev
76f7fb5231
Extending CPU dispatch to the tests; fixing a typo
2017-08-21 20:58:12 -07:00
Alexander Alekhin
f694192878
cmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)
...
- '-fvisibility' flag was updated
- PVAPI library detection was changed
2017-08-21 18:06:40 +03:00
KUANG Fangjun
336996152a
Improve the documentation.
2017-08-20 17:21:39 +02:00
Alexander Alekhin
87a98e4562
cmake: CMP0026 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
6ff9fc67bb
build: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD
2017-08-14 10:59:38 +03:00
Alexander Alekhin
7a10369f4b
Merge pull request #9331 from tomoaki0705:suppressWarningVS
2017-08-10 20:22:25 +00:00
Tomoaki Teshima
14b76a5bca
suppress warnings on Visual Studio 2013 and earlier
2017-08-10 23:03:27 +09:00
Alexander Alekhin
5e32de8173
cmake: fix __STDC macros for opencv_world build
2017-08-03 18:40:05 +03:00
Alexander Alekhin
1516103a15
cmake: fix compiler flags
2017-07-26 17:21:46 +03:00
Alexander Alekhin
bf0173bf38
ts: update valgrind suppressions
2017-07-26 17:21:45 +03:00
Alexander Alekhin
402a77e7f7
Merge pull request #9237 from alalek:fix_winrt_build
2017-07-26 10:42:49 +00:00
Alexander Alekhin
2ca561f104
Merge pull request #9217 from alalek:cleanup_3rdparty
2017-07-26 10:38:28 +00:00
Alexander Alekhin
174cb06a7a
Merge pull request #9215 from alalek:cmake_min_version
2017-07-26 10:38:11 +00:00
Alexander Alekhin
8e6e05ed3f
Merge pull request #9227 from alalek:cmake_fix_ocv_add_testdata
2017-07-25 15:56:57 +00:00
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
neok-m4700
c2e281f8cf
Update OpenCVCompilerOptions.cmake
...
misplaced else
2017-07-25 10:25:20 +02:00
Alexander Alekhin
07334bc25c
cmake: fix ocv_add_testdata() hardcoded path
2017-07-25 06:56:03 +03:00
Alexander Alekhin
e45d5446f2
cleanup unused 3rdparty files
2017-07-21 15:20:13 +03:00
Alexander Alekhin
5e6e12600f
build: enable __STDC_FORMAT_MACROS macro
2017-07-21 14:29:03 +03:00
Alexander Alekhin
92f182bc3b
minimal CMake version => 2.8.12.2
2017-07-21 14:06:19 +03:00
Alexander Alekhin
22f12dc93c
cmake: fix build with CMake 3.9.0
2017-07-20 14:49:37 +03:00
Alexander Alekhin
a44c0fd51f
cmake: ocv_cmake_dump_vars() remove duplicated information
2017-07-19 12:37:36 +03:00
atinfinity
ac64713881
fixed 'OpenCVDetectCXXCompiler.cmake' to detect C++11 feature
2017-07-17 00:20:14 +09:00
Alexander Alekhin
4e39d0371d
Merge pull request #9074 from alalek:cpu_dispatch_core_hamming
...
cpu dispatch(core): hamming
2017-07-14 16:48:07 +00:00
Alexander Alekhin
0e6ebafdb3
Merge pull request #9110 from patrikhuber:fix-msvc1911-cmake
2017-07-14 14:37:01 +00:00
Patrik Huber
600b7a30e6
Added detection of MSVC1911
...
This is VS2017 Preview. It makes sure the version is detected properly and the INSTALL target then correctly installs to x64/vc15 (the same as MSVC1910).
2017-07-06 19:02:19 +01:00
Arkadiusz Raj
0ef5c8c541
Fixing Aravis support compilation issue
2017-07-05 11:30:43 +02:00