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
Alexander Alekhin
eed5cfba7d
cmake: fix linker flags
2017-07-04 15:04:42 +03:00
Alexander Alekhin
2863c9fe19
Merge pull request #9077 from alalek:cmake_enable_cxx11
2017-07-03 16:15:29 +00:00
Tony Lian
c8783f3e23
Merge pull request #9075 from TonyLianLong:master
...
Remove unnecessary Non-ASCII characters from source code (#9075 )
* Remove unnecessary Non-ASCII characters from source code
Remove unnecessary Non-ASCII characters and replace them with ASCII
characters
* Remove dashes in the @param statement
Remove dashes and place single space in the @param statement to keep
coding style
* misc: more fixes for non-ASCII symbols
* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
Alexander Alekhin
9611aa81b2
Merge pull request #9069 from catree:ffmpeg_warnings_errors
2017-07-03 16:09:27 +00:00
Alexander Alekhin
b10bd4b65d
Merge pull request #9068 from dkurt:mkl_with_openmp
2017-07-03 16:09:11 +00:00
Alexander Alekhin
4f01ad8517
Merge pull request #9052 from jqly:patch-1
2017-07-03 16:03:46 +00:00
Alexander Alekhin
3f02f569af
cmake: update CXX11 compiler flag
2017-07-03 16:13:12 +03:00
Alexander Alekhin
4f558e8b89
cmake: added "SSE4_2" into default CPU dispatch
2017-07-02 22:45:09 +00:00
catree
921f06eb6f
Fix ffmpeg detection with -D OPENCV_WARNINGS_ARE_ERRORS=ON option.
2017-07-02 01:59:41 +02:00
dkurt
425e92e5ca
Fix MKL linkage with enabled OpenMP
2017-07-01 20:02:13 +03:00
Maksim Shabunin
6320ede98e
Removed extra dependencies from videoio library
2017-06-30 18:54:42 +03:00
jqly
444593014f
a fix for open issue 4772
2017-06-30 20:22:16 +08:00
Alexander Alekhin
8bd2e9816a
cmake: don't add vs_version.rc for static modules (ts)
2017-06-30 13:43:31 +03:00
Alexander Alekhin
82ec76c123
Merge pull request #8990 from mshabunin:fix-static-2
2017-06-27 14:53:26 +00:00
Alexander Alekhin
f8a75c4361
dispatch: added CV_TRY_${OPT} macro, fix dnn build
...
- 1: OPT is available directly or via dispatcher
- 0: optimization is not compiled at all
2017-06-27 17:05:15 +03:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Vadim Pisarevsky
ef692350e0
Merge pull request #8966 from alalek:protobuf_sources
2017-06-26 10:27:40 +00:00
Alexander Alekhin
6b7a1d4dde
build: disable AVX512
...
Currently it is not supported.
All builds are broken with enabled AVX512 option.
2017-06-26 00:31:24 +03:00
Vadim Pisarevsky
fa7e7e0ff9
Merge pull request #8900 from alalek:update_android_build
2017-06-23 10:58:53 +00:00
Alexander Alekhin
d649d1388e
cmake: fix typo
2017-06-22 19:21:59 +03:00
Alexander Alekhin
1c4c58d1b5
3rdparty: update CMake scripts for protobuf
2017-06-22 17:44:53 +03:00
Maksim Shabunin
d27009c775
Merge pull request #8856 from mshabunin:media-tests-upgrade
2017-06-22 11:45:52 +00:00
Alexander Alekhin
d29c299cdb
cmake: additional messages on download errors
2017-06-21 19:04:27 +03:00
Dmitry Kurtaev
16368a275b
cmake: add Halide support ( #8794 )
2017-06-21 14:33:47 +03:00
Alexander Alekhin
3e3e2dd512
android: make optional "cpufeatures", build fixes for NDK r15
2017-06-21 13:34:19 +03:00
Vadim Pisarevsky
2c30f358dc
Merge pull request #8947 from alalek:vs_version
2017-06-21 09:33:52 +00:00
Alexander Alekhin
9496fe40ec
cmake: guard scanning of default MKL system-wide paths
...
- WITH_MKL option is enabled
- user doesn't specify MKLROOT/MKL_ROOT_DIR variables
2017-06-21 02:44:48 +00:00
Maksim Shabunin
87b569d812
Rewritten some tests in videoio and imgcodecs modules
...
general:
- all iterative tests have been replaced with parameterized tests
- old-style try..catch tests have been modified to use EXPECT_/ASSERT_ gtest macros
- added temporary files cleanup
- modified MatComparator error message formatting
imgcodecs:
- test_grfmt.cpp split to test_jpg.cpp, test_png.cpp, test_tiff.cpp, etc.
videoio:
- added public HAVE_VIDEO_INPUT, HAVE_VIDEO_OUTPUT definitions to cvconfig.h
- built-in MotionJPEG codec could not be tested on some platforms (read_write test was disabled if ffmpeg is off, encoding/decoding was handled by ffmpeg otherwise).
- image-related tests moved to imgcodecs (Videoio_Image)
- several property get/set tests have been combined into one
- added MotionJPEG test video to opencv_extra
2017-06-20 18:20:41 +03:00
Alexander Alekhin
db35e13b46
build: added VERSIONINFO resource
2017-06-20 15:45:21 +03:00
Maksim Shabunin
c06f3d63e8
Initial version of MediaSDK integration:
...
- cmake dependencies search (WITH_MFX option)
- raw H264, H265, MPEG2 encoding and decoding
- tests for supported formats
2017-06-20 12:15:10 +03:00
Alexander Alekhin
c3bea59a76
cmake: set minimal CPU instruction to SSE3 (x64)
2017-06-11 03:51:53 +00:00
Alexander Alekhin
1961bb1857
cmake: add ENABLE_BUILD_HARDENING option
2017-06-08 00:39:29 +00:00
Alexander Alekhin
0e1d65d3b1
build: fix PCH stub files generation optimization
2017-06-06 21:09:22 +03:00
Vadim Pisarevsky
925594d1e3
Merge pull request #7894 from alalek:ocl_program
2017-05-03 13:48:58 +00:00
Maksim Shabunin
ea49d7b7c5
Merge pull request #8653 from alalek:android_fixes
2017-05-03 12:20:19 +00:00
Alexander Alekhin
cdc7f10767
cmake: dispatcher: add handling of include dirs
...
from linked targets of base modules
2017-04-27 18:11:32 +03:00
Alexander Alekhin
4c2858fd61
cmake: fix POPCNT & SSE4.2 detection code
2017-04-26 18:59:43 +03:00
Alexander Alekhin
133b91a026
android: build fixes
...
- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+
2017-04-26 14:24:51 +03:00
Alexander Alekhin
f3eff00bf7
cmake: update handling of IPPICV/IPPIW
2017-04-26 00:15:54 +03:00
Alexander Alekhin
f1c8094f5f
Merge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update
2017-04-21 10:55:29 +00:00
Pavel Vlasov
35c7216846
IPP for OpenCV 2017u2 initial enabling patch;
2017-04-20 20:26:30 +03:00
Tomoaki Teshima
ebf13b39e5
fix build error on ODROID-X2
2017-04-18 19:31:57 +09:00
Alexander Alekhin
c90dee668f
cmake: fix optimization filter
...
Check file name only:
Excluding from source files list (optimization is disabled):
C:/Code/SrcExt/OpenCV/Buildv3.2_x64/modules/core/opencl_kernels_core.cpp
2017-04-12 18:27:20 +03:00
Alexander Alekhin
c1ade083d9
ffmpeg: add __STDC_CONSTANT_MACROS to check code
2017-04-11 12:35:48 +03:00
Tomoaki Teshima
9cd42650dc
build with cc 6.2 on Jetson TX2
2017-04-10 22:19:17 +09:00
Alexander Alekhin
739f87da6d
Merge pull request #8518 from alalek:fix_fp16
2017-04-04 20:06:59 +00:00
Alexander Alekhin
e5d9b608c4
cmake: fix fp16 support
2017-04-04 20:34:58 +03:00
Alexander Alekhin
1f86d8564f
cmake: fix GCC precompiled headers warnings
2017-04-04 19:48:16 +03:00
Alexander Alekhin
297ba85323
Merge pull request #8441 from alalek:dispatch_mathfuncs_core
2017-04-03 14:03:49 +00:00
Alexander Alekhin
8bee226d79
Merge pull request #8495 from sergiud:standalone-dynamic-ipp-detection
2017-04-02 10:17:06 +00:00
Sergiu Deitsch
98b8c32f30
cmake: fixed standalone dynamic IPP detection under win32
2017-03-31 15:44:38 +02:00
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