Alexander Alekhin
64057965f5
Merge pull request #5979 from alalek:world_disable_pch
2016-01-15 17:28:48 +00:00
Alexander Alekhin
c75f9c80c7
cmake: turn off precompiled headers in case of opencv_world builds
2016-01-15 19:43:24 +03:00
Alexander Alekhin
9cd6731894
cmake: add DEBUG_PRE/DEBUG_POST commands handling
...
Useful for debug purposes:
cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
2016-01-15 14:36:03 +03:00
Alexander Alekhin
9d4ee2f54d
cmake: added generation of CMakeVars.txt
...
related: #5845
2016-01-15 13:54:28 +03:00
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
2016-01-15 13:05:16 +03:00
Alexander Alekhin
c8ff7a4867
build: fix opencv_world with CUDA
2016-01-14 17:23:55 +03:00
Alexander Alekhin
8d79285d02
Merge pull request #5840 from paroj:v4ldefault
2015-12-24 10:08:59 +00:00
Pavel Rojtberg
96654f0084
make sure cap_v4l is used by default on Linux
...
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
2015-12-20 01:19:48 +01:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
2015-12-18 09:34:36 +00:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Nils Plath
4474845dd5
Simplified status update.
2015-12-16 21:53:34 +01:00
Nils Plath
a1173dfa27
Added switch to CMakeLists.txt in order to enable/disable Matlab.
2015-12-14 23:30:28 +01:00
Alexander Alekhin
5053aeeb19
cmake: DOWNLOAD_EXTERNAL_TEST_DATA option
2015-12-12 15:23:31 +03:00
Alexander Alekhin
c2a86a6a84
NEON flags fix
2015-12-11 12:06:24 +03:00
Dan
46ec9c386b
Gstreamer 1.0 on windows.
2015-12-09 09:11:45 -05:00
Vadim Pisarevsky
9c0a5523e4
Merge pull request #5757 from alalek:merge-2.4
2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
Maksim Shabunin
b4bcdd10a1
HAL: improvements
...
- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library
2015-12-03 14:43:37 +03:00
Vadim Pisarevsky
7323823b38
Merge pull request #5582 from sizeofvoid:master
2015-11-02 11:39:43 +00:00
Rafael Sadowski
e38b54a786
fix cmake OpenBSD linker libs
...
OpenBSD needs m and pthread like Net- and FreeBSD.
2015-10-28 22:47:00 +01:00
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
2015-10-13 17:34:08 +03:00
Vadim Pisarevsky
9533982729
Merge pull request #5272 from avershov:opencl-vaapi-fallback
2015-09-14 11:54:20 +00:00
Maksim Shabunin
10d8e956f4
Enabled pthreads backend for mingw
2015-09-10 17:12:22 +03:00
Alexey Ershov
68a0347ff9
fallback path & sample timing implemented
...
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
2015-09-04 02:42:49 +03:00
Maksim Shabunin
e009d79cc8
fixup! Some changes to support mingw-w64
2015-09-01 12:14:40 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Alexey Ershov
a8656ea20f
implemented core support & sample
...
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
2015-08-21 02:44:03 +03:00
Alexander Alekhin
63bae5da71
vtk: disable on cross-compilation
2015-08-03 19:09:07 +03:00
Evgeny Agafonchikov
6a6d58d389
Adding test support for WINRT
2015-06-30 15:35:20 +03:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
)
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
2015-06-09 15:53:08 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
kalistratovag
bf5393ae58
parallel for on pthreads initial commit
...
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
2015-06-01 17:48:21 +03:00
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
Vadim Pisarevsky
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00
Maxim Kostin
55f78f8a83
Added configuration changes enabling videoio WinRT support.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:29:06 +03:00
Vladislav Vinogradov
cde697dd14
introduce BUILD_TINY_GPU_MODULE CMake option
...
it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)
2015-05-06 17:13:59 +03:00
Ruslan Baratov
441f93d58d
Unify iOS platform check
...
There is only one place that use condition `CMAKE_SYSTEM_NAME STREQUAL iOS`.
All other `if` command use just IOS.
2015-05-02 23:44:19 +02:00
Ying Xiong
82668e06d4
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-24 22:39:49 +02:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
Ying Xiong
9cccd87e79
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-06 16:37:06 -04:00
Roman Donchenko
6e121b2e29
Use imported targets for linking to CUDA
...
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:
* It removes the need to use link_directories, which doesn't guarantee that
the libraries from the supplied directory will be used (there may be
libraries with the same names earlier in the search path).
* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
is used with target_link_libraries, where such entries are treated as linker
flags, so doing this is unportable. I remove the support for -L entries
from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
future.
2015-03-31 13:46:28 +03:00
Roman Donchenko
149c1c16ba
cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
...
How this worked before, I do not know.
2015-03-31 12:41:50 +03:00
Maksim Shabunin
9fbc92aace
Added cmake option for abi descriptor generating (GENERATE_ABI_DESCRIPTOR)
2015-03-17 16:04:04 +03:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Roman Donchenko
35760bb6bf
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
(cherry picked from commit c1e3ca170e
)
Conflicts:
CMakeLists.txt
2015-03-10 16:24:23 +03:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
quentin
afdf319f36
Add -L for CUDA libs path to pkg-config
...
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
2015-03-05 14:37:21 +01:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Roman Donchenko
c1e3ca170e
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
2015-02-20 12:38:25 +03:00
Roman Donchenko
0387f8ad56
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
...
Absolute destinations are not necessary, and prevent CPack from working.
2015-02-10 19:43:29 +03:00
Alexander Alekhin
79416cdf10
ocl: disable OpenCL by default for Android builds
2015-02-08 13:08:14 +03:00
Alexander Smorkalov
9206ec30a2
opencv_testing.sh script installation is removed as run tests script does the same thing.
2015-01-29 19:20:18 +03:00
Vadim Pisarevsky
97aa8d3341
Merge pull request #3603 from alalek:ocl_svm
2015-01-29 05:35:46 +00:00
Alexander Alekhin
0a07d780e0
ocl: OpenCL SVM support
2015-01-23 20:37:45 +03:00
Ben Hagen
5245c7454c
Do not blacklist GStreamer on Apple
2015-01-23 12:59:09 +01:00
Ben Hagen
8914fa51ff
Do not blacklist GStreamer on Apple
2015-01-22 14:17:43 +01:00
Ilya Lavrenov
e9a6c5db21
sqsum
2015-01-20 21:10:06 +03:00
Ilya Lavrenov
fc0869735d
used popcnt
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
bc394e7516
detection of other CPU features
2015-01-12 10:59:30 +03:00
Ilya Lavrenov
8d48632ebe
avx2
2015-01-12 10:59:28 +03:00
Alexander Smorkalov
0f263e125b
Full AARCH64 support with NEON and new CUDA toolkit.
2014-12-28 11:51:33 +03:00
Maksim Shabunin
ec9a17e71a
Restored PlantUML support for doxygen
2014-12-26 19:17:18 +03:00
Maksim Shabunin
bebf6c47c6
Removed Sphinx generation commands from cmake scripts
2014-12-26 19:17:08 +03:00
Vladislav Vinogradov
b75b0c822d
install test data on Windows platform too
2014-12-23 17:40:41 +03:00
Vadim Pisarevsky
fd6ef87c32
Merge pull request #3529 from jet47:fix-linux-install
2014-12-23 13:38:23 +00:00
Vladislav Vinogradov
b15cf355af
remove opencv_testing.sh installation to /etc/profile.d/
...
opencv_run_all_tests_unix.sh already exports OPENCV_TEST_DATA_PATH
2014-12-19 11:55:38 +03:00
Boaz Stolk
bb873b1de5
add option to link to dynamic IPP libraries
2014-12-12 14:21:47 +01:00
Andrey Kamaev
1744098438
silence cmake 3.0+ warnings on LOCATION attribute
2014-11-18 16:18:22 +03:00
Vadim Pisarevsky
529af7a90e
Merge pull request #3364 from mshabunin:doxygen-docs-24
2014-10-30 10:42:25 +00:00
Vadim Pisarevsky
0cf170587f
Merge pull request #3363 from asmorkalov:qnx_support
2014-10-26 17:42:24 +00:00
Maksim Shabunin
9b55c09999
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
2014-10-23 18:27:26 +04:00
Alexander Smorkalov
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Vladislav Vinogradov
07bd58a0e8
turn on testing support in root binary directory
2014-10-21 18:45:47 +04:00
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
2014-10-16 14:51:53 +00:00
Vadim Pisarevsky
18ef0cfe81
Merge pull request #3335 from ilya-lavrenov:neon_ios
2014-10-15 10:29:54 +00:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Ilya Lavrenov
69c82b4c2b
ability to compile for iOS with Neon
2014-10-13 22:57:50 +04:00
Andrey Kamaev
5dde172452
silence cmake 3.0+ warnings on LOCATION attribute
2014-10-11 20:35:48 +04:00
Maksim Shabunin
b8457be394
Merge pull request #3216 from xantares:patch-1
2014-10-02 13:25:06 +00:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
xantares
d391a6d49f
Also test for target.
2014-09-22 15:14:35 +00:00
Maksim Shabunin
2992e3a1b6
Fixed android test detection and some spaces in CMakeLists.txt
2014-09-19 13:11:59 +04:00
Maksim Shabunin
cff5e3ee88
Changed java tests detection procedure
2014-09-19 12:34:42 +04:00
Vadim Pisarevsky
a67484668e
Merge pull request #2711 from GregoryMorse:patch-5
2014-09-18 11:28:58 +00:00
xantares
5d0467e769
Update CMakeLists.txt
2014-09-13 15:49:34 +02:00
GregoryMorse
587402859e
Add VS2013 support
...
Fix indentation in output that made it look like changes were dependent on WinRT when they are independent libraries.
Defaults needed flipping otherwise undesired behavior. Change is tested with combinations.
Fixed and tested
Windows Phone v8.0/v8.1 SDK for Universal Windows Apps (Windows Phone v8.1 Silverlight App support not included) and fix initial cache causing problem
2014-09-10 17:18:41 +08:00
Igor Kuzmin
ed402c5be6
XIMEA cam support: allow on OS X too
2014-09-09 19:25:14 +04:00
Igor Kuzmin
0421da78b3
XIMEA cam support: allow on OS X too
2014-09-09 19:17:13 +04:00
Alexander Smorkalov
35768ed638
Python tests added to -tests deb package.
2014-09-08 18:11:12 +04:00
Ilya Lavrenov
040ff7993f
don't use IPP on ARM
2014-09-01 12:30:49 +04:00
Alexander Alekhin
b70a391e6c
fix VCS version
2014-08-15 12:09:16 +04:00
mshabunin
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00