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