Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
Alexander Alekhin
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201
...
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
2018-11-23 20:02:46 +03:00
Alexander Alekhin
1317c3d178
cmake: don't generate dllmain for cudev module
2018-11-19 19:11:52 +03:00
Alexander Alekhin
465ae048a0
Merge pull request #12887 from alalek:fix_cmake_conditions
2018-10-24 13:17:54 +00:00
Alexander Alekhin
d6a8e08acc
cmake: fix variable expand in CMake conditions
2018-10-21 15:02:40 +00:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Alexander Alekhin
70f2ee917e
cmake: add DllMain() into each OpenCV DLL
...
to detect process termination after ExitProcess() call
2018-10-10 11:00:59 +00:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Alexander Alekhin
29bee6f07e
cmake: move Matlab scripts to opencv_contrib ( #12541 )
...
* matlab: move to opencv_contrib
* cmake: preserve variables scope for processing modules
- use macro instead of function to avoid scope resets
2018-09-17 14:55:42 +03:00
Jakub Golinowski
9f1218b00b
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
...
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
2018-08-31 16:23:26 +03: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
Maksim Shabunin
5aceee5a36
Restored tests dependencies processing
2018-07-31 19:34:19 +03:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08: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
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
1b83bc48a1
dnn: make OpenCL DNN code optional
2018-03-01 12:12:40 +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
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
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
Alexander Alekhin
3d6659112f
cmake: fix includes processing
2018-02-02 21:52:54 +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
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00: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
0b33eb0929
cmake: fix ocv_target_compile_definitions() for world builds
...
fixes CUDA build
2017-12-15 23:30:53 +03:00
Alexander Alekhin
768f4cb7bc
python: 'sub-module' for binding sources and documentation meta information
2017-12-09 21:01:46 +00:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +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
Maksim Shabunin
b1fe298764
Removed cmake submodules and contrib_world references
2017-10-19 17:34:59 +03:00
Alexander Alekhin
3b993431be
cmake: fix build process of OpenCL kernels
2017-09-20 18:10:31 +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
Boris Fomitchev
76f7fb5231
Extending CPU dispatch to the tests; fixing a typo
2017-08-21 20:58:12 -07:00
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
2017-08-19 15:15:05 +00:00
Alexander Alekhin
5e32de8173
cmake: fix __STDC macros for opencv_world build
2017-08-03 18:40:05 +03:00
Alexander Alekhin
5e6e12600f
build: enable __STDC_FORMAT_MACROS macro
2017-07-21 14:29:03 +03: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
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Alexander Alekhin
d649d1388e
cmake: fix typo
2017-06-22 19:21:59 +03:00
Alexander Alekhin
db35e13b46
build: added VERSIONINFO resource
2017-06-20 15:45:21 +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
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
Maksim Shabunin
50d350bcd1
Enable GNU STL debug mode for debug builds
2017-01-31 12:36:26 +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
b7630a088b
cmake: add global defines to enable useful macros
2017-01-13 14:30:19 +03:00