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