1385 Commits

Author	SHA1	Message	Date
Alexander Alekhin	80bd67c36b	Merge pull request #4125 from ruslo:interface.include.dirs	2015-06-17 16:04:46 +00:00
Maksim Shabunin	f63dde2f43	Separate OpenCV.mk files for different ABIs	2015-06-17 18:10:28 +03:00
Maksim Shabunin	7bfd070864	Merge pull request #4095 from alalek:hal_unresolved_symbols	2015-06-17 14:35:40 +00:00
Alexander Alekhin	1ce0ef9d41	fix build without IPP (and empty 3rdparty)	2015-06-17 17:24:35 +03:00
Ruslan Baratov	f30bf39bd4	Add OpenCV_INCLUDE_DIRS to INTERFACE_INCLUDE_DIRECTORIES target property ... With this fix there is no need to add includes by using `include_directories(${OpenCV_INCLUDE_DIRS})`. Directory will be added by command `target_link_libraries(... ${OpenCV_LIBS})` automatically.	2015-06-17 16:03:21 +02:00
Vadim Pisarevsky	220bb14d10	Merge pull request #4114 from alalek:ocl_generator_error_processing	2015-06-17 11:26:53 +00:00
Alexander Smorkalov	546e68dc65	Merge pull request #4034 from jet47:opencv_run_all_tests_unix	2015-06-17 08:19:47 +00:00
Vadim Pisarevsky	b7c2a46830	Merge pull request #4107 from SpecLad:libav-compat	2015-06-16 13:22:40 +00:00
Alexander Alekhin	a482dcce46	fix support for pthreads parallel_for	2015-06-11 16:53:07 +03:00
Alexander Alekhin	b7cfd5a7da	ocl: added errors processing in OpenCL code generator, resolve space issue	2015-06-11 15:36:29 +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
Alexander Smorkalov	57ab0d4d17	Debian packages header update to fix conflict with OpenCV from deb repo.	2015-06-09 14:59:12 +03:00
Roman Donchenko	02f8b85dd9	Add ARM64 packaging support	2015-06-08 18:03:08 +03:00
Roman Donchenko	1fbdca0c9b	Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE ... Because that's the variable actually used by CPack.	2015-06-08 18:03:07 +03:00
Alexander Alekhin	8184e57dd6	fix tests build (win,shared,world)	2015-06-05 16:30:36 +03:00
Maksim Shabunin	7ee79b73f6	AndroidMgr: fixed package build	2015-06-03 19:01:48 +03:00
Maksim Shabunin	caffbaafbe	Updated Manager for Android	2015-06-02 17:33:04 +03:00
Vadim Pisarevsky	41af58d1d5	Merge pull request #4076 from kalistratovag:parallel_pthreads	2015-06-01 16:53:50 +00: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
Alexander Smorkalov	1df0f1da97	Precise default CUDA version for Tegra X1 chips.	2015-05-30 23:30:56 +02:00
Vadim Pisarevsky	f7ad192842	Merge pull request #4063 from Dikay900:2_4_to_master	2015-05-28 14:49:13 +00:00
Alexander Alekhin	75558ae75c	Merge pull request #4058 from mshabunin:latch-sample	2015-05-26 16:26:57 +00:00
Ilya Lavrenov	bb72206ec5	ability to enable OpenMP simultaneously with other parallel framework	2015-05-26 18:08:28 +02:00
Maksim Shabunin	5ad4bed70a	Added cvconfig.h copy during the build	2015-05-26 15:58:27 +03:00
Vadim Pisarevsky	8fb37606f6	Merge pull request #4032 from mshabunin:fix-pkg-config	2015-05-26 12:47:14 +00:00
Vladislav Vinogradov	653810e4df	fix installation layout for debian packages: ... Install symlinks to shared libraries as a part of development package, not runtime package. It is default behavior for debian packages.	2015-05-24 14:06:32 +02:00
Alexander Smorkalov	5141141e2b	Deb package build fix for CUDA 6.5 and newer. ... (cherry picked from commit e650d87e47) (cherry picked from commit ca9c52ac97) Conflicts: cmake/OpenCVPackaging.cmake	2015-05-24 11:55:47 +02:00
Maksim Shabunin	3863dc5b2b	Updated pkg-config generation, added sample makefile	2015-05-22 16:09:07 +03:00
Samuel Martin	671a630f47	cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation ... Using absolute path to locate the components in the "Libs:" field of the *.pc can badly break cross-compilation, especially when building statically linked objects. Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment variables are set [1]. This feature is very helpful and common in cross-compilation framework like Buildroot [2,3]. When there are absolute paths in the *.pc files, pkg-config won't be able to do the path substitutions for these paths when the aforementioned environment variables are set. In such case, since the prefix is the target one, not the sysroot one, these libraries' absolute paths will point to: - in the best case: a non-existing file (i.e. these files do not exists on the host system; - at worst: the host system's libraries. This will make the linking failed because these host system's libraries will most likely not be build for the target architecture [4]. So, this patch replace the components' absolute paths by the form: -L<libdir> -l<libname> This way, the linker will be able to resolve each dependency path, whatever the kind of objects/build (shared object or static build) it is dealing with. Note that for static link, the library order does matter [5]. The order of the opencv components has been carefully chosen to comply with this requirement. Fixes #3931 This patch is a port of [6] on the master branch. [1] http://linux.die.net/man/1/pkg-config [2] http://buildroot.org/ [3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in [4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log [5] http://stackoverflow.com/questions/45135/linker-order-gcc [6] eceada586b Signed-off-by: Samuel Martin <s.martin49@gmail.com>	2015-05-22 16:09:05 +03:00
Ilya Lavrenov	d89b6226a3	fixed Android mk generation for arm64-v8a	2015-05-21 15:00:46 +03:00
Piotr Dobrowolski	6d0407b65e	VideoCapture with digital camera and gPhoto2 library	2015-05-21 00:41:39 +02:00
Vladislav Vinogradov	21d8b588a2	exclude dates from report names	2015-05-19 18:26:13 +03:00
Vladislav Vinogradov	5d66b1130b	save tests console output to separate log files	2015-05-19 18:26:13 +03:00
Vladislav Vinogradov	0550b2c1fe	check that current directory has write access	2015-05-19 18:26:04 +03:00
Alexander Smorkalov	7f63776395	Precise default CUDA version for Tegra X1 chips.	2015-05-19 13:24:17 +03:00
Maksim Shabunin	e936670571	Install cvconfig.h file	2015-05-18 19:19:48 +03:00
Alexander Smorkalov	0410fe6978	Merge pull request #3785 from jet47:tiny-gpu-module	2015-05-18 08:00:12 +00:00
Vadim Pisarevsky	35884a7e3f	Merge pull request #3982 from patrikhuber:vs2015-support-master	2015-05-15 12:32:27 +00:00
Vadim Pisarevsky	a26ab3ab16	Merge pull request #3917 from yanlend:patch-1	2015-05-14 21:16:24 +00:00
Marvin Smith	ae933db526	Fixing the gdal include error that Macports seems to only mess up.	2015-05-11 20:27:50 -07:00
Vadim Pisarevsky	1aa03cecf1	Merge pull request #3981 from patrikhuber:vs2015-support	2015-05-06 15:35:36 +00: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
Alexander Smorkalov	63d6cc5ca6	Added explicit deb package dependency from libtbb-dev if TBB is enabled.	2015-05-06 13:10:39 +03:00
Patrik Huber	40b765b7c2	Add VS2015 compatibility to CMake scripts	2015-05-02 15:24:14 +01:00
Patrik Huber	2b1103c1d3	Add support for VS2015 ... Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.	2015-05-02 13:31:43 +01:00
Vadim Pisarevsky	30a3ff0de6	fixed compile errors on OSX and other systems where ffmpeg is detected manually, not via pkg-config	2015-04-29 11:43:53 +03:00
Vadim Pisarevsky	e60dcc9b3b	Merge pull request #3966 from Dikay900:master_diff_to_2_4_2	2015-04-28 11:00:57 +00:00
Maksim Shabunin	bcf02ae439	Merge pull request #3678 from mshabunin:explicit-sse-disable	2015-04-28 10:41:14 +00:00
Maksim Shabunin	1138a38dbe	Use explicit no-sse flags when SSE is off ... Also: - Silence clang warnings about unsupported command line arguments - Add diagnostic print to calib3d test - Fixed perf test relative error check - Fix iOS build problem	2015-04-27 15:36:10 +03:00
Mansour Moufid	655b28ee0c	Use the CMake find_library command to find the FFmpeg libraries. ... Conflicts: cmake/OpenCVFindLibsVideo.cmake	2015-04-25 19:00:33 +02:00
Vladimir Kolesnikov	2c73e49dac	Not block PDB file in multithreaded build on Windows. ... If used cl compiler, but generator is not Visual Studio e.g. Ninja, enable FS option to prevent blocking PDB file in multithreaded build.	2015-04-25 18:54:50 +02:00
Abhijit Kundu	fd4df0f67d	Added suuport for finding Intel TBB for Visual Studio 2013	2015-04-25 10:23:34 +02:00
Alexander Nitsch	d6c95621e8	Implement CMAKE_CURRENT_LIST_DIR for older CMake ... The use of built-in CMAKE_CURRENT_LIST_DIR requires at least CMake 2.8.3. This fix properly defines the variable to allow its use in versions < 2.8.3 as well. Fixes issue #4205. Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR This avoids violation of possible future CMake policy checks regarding reserved/read-only variables.	2015-04-24 23:10:50 +02:00
Ilya Lavrenov	614edafe73	typo	2015-04-24 22:38:51 +02:00
Ilya Lavrenov	f57063efa2	port of aarch64 cuda changes from 2.4	2015-04-23 17:57:29 +03:00
Ilya Lavrenov	847976de4e	fixed find cuda for aarch64	2015-04-23 14:49:12 +03: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
Vadim Pisarevsky	063e4004ba	Merge pull request #3935 from vpisarev:extending_hal_part1	2015-04-21 14:02:02 +00:00
Vadim Pisarevsky	926754a66e	another attempt to resolve ABI checker complains	2015-04-21 12:42:46 +03:00
Vadim Pisarevsky	fa41653420	trying to avoid ABI checker failures	2015-04-21 11:30:41 +03:00
Alexander Alekhin	8c2bde2af4	Merge pull request #3923 from ilya-lavrenov:typo	2015-04-13 16:57:13 +00:00
yanlend	443b3157e0	Fix win32 search for same bitness executable ... find_package(PythonInterp) calls find_program(PYTHON_EXECUTABLE), i.e. without version number. For the Win32-search before to be effective, the same variable has to be used.	2015-04-10 14:57:31 +02:00
Maksim Shabunin	97c78838a4	Fixed windows build and one warning	2015-04-10 11:37:16 +03:00
Maksim Shabunin	728bd0ba84	Merge pull request #3905 from mshabunin:fix-android-mk	2015-04-09 12:08:05 +00:00
Maksim Shabunin	f803c2a7bb	Generators: updated the library gathering loop	2015-04-08 14:15:20 +03:00
Maksim Shabunin	35b2139929	Basic HAL module	2015-04-07 18:16:22 +03:00
Ilya Lavrenov	4273534c92	typo	2015-04-07 11:08:21 +03:00
Maksim Shabunin	979721c979	Fix generating of android.mk	2015-04-06 16:12:00 +03:00
Alexander Smorkalov	772fcf4088	Merge pull request #3893 from SpecLad:cuda-imported-targets	2015-04-02 13:56:31 +00:00
Vadim Pisarevsky	da0e2c5bf3	Merge pull request #3889 from nitsch:fix-mingw-cmake	2015-04-02 11:45:20 +00:00
Vadim Pisarevsky	100c2dd91c	Merge pull request #3852 from renko:multithread_cl_not_studio_generator	2015-04-01 13:25:39 +00:00
Vladimir Kolesnikov	58c9135626	Not block PDB file in multithreaded build on Windows. ... If used cl compiler, but generator is not Visual Studio e.g. Ninja, enable FS option to prevent blocking PDB file in multithreaded build.	2015-04-01 13:52:07 +03: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
Alexander Nitsch	afd9de6f1b	Fix static/shared lib detection ... The check for BUILD_SHARED_LIBS had its logic backwards. If this variable is not defined we must assume a build of static libs.	2015-03-31 00:05:49 +02:00
Alexander Nitsch	66e653d24d	Remove local variables from CMAKE namespace	2015-03-31 00:05:48 +02:00
Alexander Nitsch	3fff0e5b3c	Fix MinGW detection on x86 ... Make detection of x64 using the gcc's target triplet identical to the one used in cmake/OpenCVDetectCXXCompiler.cmake. Otherwise, MinGW-w64 setups will always be treated as x64 since they contain "w64" as vendor key.	2015-03-31 00:05:48 +02:00
Alexander Nitsch	8f84a73b82	Fix MinGW architecture detection ... Fix typo that would always lead to detection of x86 for MinGW builds in the OpenCVConfig.cmake file.	2015-03-31 00:05:47 +02:00
Alexander Nitsch	2e86cedef2	Fix MinGW detection on x86 ... MinGW-w64 always uses "w64" as vendor key which the previously used check for "64" anywhere in the target triplet matched. This would lead to MinGW-w64 setups always being treated as x64. Turns out we do not even need this additional check since the architecture has been correctly determined earlier in this file. No need to do it again.	2015-03-31 00:02:03 +02:00
Roman Donchenko	e6619cf580	Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop ... There's no reason to do it twice.	2015-03-30 15:04:27 +03:00
Roman Donchenko	122b9f8e17	Turn ocv_convert_to_lib_name into a function	2015-03-30 14:58:37 +03:00
howtobeahacker	ebd7d08408	fix bug 4269	2015-03-30 00:01:20 +08:00
Kevin Squire	5e354fa844	Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden	2015-03-26 17:48:03 -07:00
Vadim Pisarevsky	174593643c	Merge pull request #3863 from MSOpenTech:fix_winrt_linker	2015-03-24 15:05:43 +00:00
Alexander Nitsch	d430664791	Remove local variables from CMAKE namespace	2015-03-24 14:42:55 +01:00
Evgeny Agafonchikov	c196df6db0	Do not link vfw32 library for WinRT ... HAVE_VFW flag is defined by CMake try_compile check. Check fails for WINRT as vfw.h begins with and contains empty set of functions for Store apps. So we can safely remove vfw32.lib for WINRT in general (independently of availability for specific configuration)	2015-03-23 20:45:58 +03:00
Evgeny Agafonchikov	17d36b7835	Removing unused winrttest.cpp file	2015-03-23 16:56:50 +03:00
Maksim Shabunin	796bf01797	Do not compare extra modules in ABI check	2015-03-23 13:10:40 +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	c71e94f054	Mark the libs component required ... Everything else depends on it, after all. (cherry picked from commit cf54e3b97e) Conflicts: cmake/OpenCVPackaging.cmake	2015-03-10 16:24:23 +03:00
Roman Donchenko	8a732e306f	Add component display names ... (cherry picked from commit 6d52ea8984)	2015-03-10 16:24:23 +03:00
Roman Donchenko	87eb3f6e68	Update the CPack variables to match the changes in asmorkalov/CMake#1 ... Which also happens to align the non-Debian specific variables with the ones used by upstream CMake. (cherry picked from commit b8c60234c3) Conflicts: cmake/OpenCVPackaging.cmake	2015-03-10 16:24:23 +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
Roman Donchenko	1a3273a7e3	Remove useless CPACK_*_COMPONENT_INSTALL variables ... They don't actually do anything. And even if they did, all components are enabled by default, anyway. (cherry picked from commit 49fe496914) Conflicts: cmake/OpenCVPackaging.cmake	2015-03-10 12:53:28 +03:00
Alexander Nitsch	13694c8ae8	Fix MinGW detection on x86 ... Make detection of x64 using the gcc's target triplet identical to the one used in cmake/OpenCVDetectCXXCompiler.cmake. Otherwise, MinGW-w64 setups will always be treated as x64 since they contain "w64" as vendor key.	2015-03-07 15:49:48 +01:00
Alexander Nitsch	dde7c22fad	Fix MinGW architecture detection ... Fix typo that would always lead to detection of x86 for MinGW builds in the OpenCVConfig.cmake file.	2015-03-07 15:37:21 +01:00
Vadim Pisarevsky	643bbb2d93	looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt	2015-03-06 16:57:38 +03:00
Vadim Pisarevsky	4aa6d10a60	added Maksim's fix as well; they both handle correctly more cases than each of them individually	2015-03-06 15:48:36 +03:00
Vadim Pisarevsky	5d8a1bf813	explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only	2015-03-06 15:02:22 +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
Vadim Pisarevsky	6820292256	Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib	2015-03-03 12:52:03 +00:00
Maxim Kostin	22a30af353	Fixing buildbot job: ... - explicitly turning OCL off since WinRT does not support it - fixing macro definitions in core/ocl.cpp Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:45 +03: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
Maksim Shabunin	37c74e38f4	Python support	2015-03-02 18:13:00 +03:00
Maksim Shabunin	457123027e	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
Vadim Pisarevsky	b595812bd0	Merge pull request #3745 from nitsch:fix-mingw-detection	2015-03-02 10:55:00 +00:00
Vadim Pisarevsky	8e37a693e5	Merge pull request #3758 from ilya-lavrenov:aarch64	2015-03-02 10:50:31 +00:00
Vadim Pisarevsky	0a5df01626	Merge pull request #3763 from laomaiweng:patch-1	2015-03-02 10:35:40 +00:00
Quentin Minster	98d7e52b0a	Update OpenCVDetectCUDA.cmake ... Add check for CUDA version >= 7.0 (currently in RC1), which drops support for arches 1.x.	2015-02-27 00:41:31 +01:00
Ilya Lavrenov	c5a80193a8	aarch64 support	2015-02-26 19:43:32 +03:00
Maksim Shabunin	eb30799aed	Disable object libraries building for cmake 2.8.7 and earlier	2015-02-25 15:00:44 +03:00
Alexander Nitsch	a5b293b412	Fix setting of architecture for MinGW builds ... The architecture has been correctly determined earlier in this file. No need to do it again.	2015-02-24 23:13:27 +01:00
Alexander Smorkalov	96d7bcc2a9	Merge pull request #3677 from ilya-lavrenov:cuda_backport	2015-02-24 15:06:15 +00:00
Ilya Lavrenov	e03136e951	backport from master	2015-02-24 16:05:21 +03:00
Alexander Smorkalov	1c6e9fdfae	Merge pull request #3735 from SpecLad:align-cpack-variables	2015-02-24 11:42:40 +00:00
Alexander Nitsch	8ae6402799	Fix MinGW detection on x86 ... MinGW-w64 always uses "w64" as vendor key which the previously used check for "64" anywhere in the target triplet matched. This would lead to MinGW-w64 setups always being treated as x64. Since we are actually interested in finding the "64" in the triplet's operating system key, this fix makes sure to look for "mingw64" and thus avoids the false match. Fixes issue #3835. Credits to Lode Leroy for the original patch.	2015-02-23 15:03:28 +01:00
Ilya Lavrenov	58b3869730	fixed cross-compilation	2015-02-22 13:20:37 +03:00
Ilya Lavrenov	0832b47d21	fixed cross-compilation for Android with CUDA	2015-02-22 13:18:57 +03:00
Alexander Smorkalov	dcc569ee5c	Merge pull request #3721 from nitsch:fix-cmake-current-list-dir	2015-02-21 16:49:36 +00:00
Alexander Nitsch	c2944dbc0c	Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR ... This avoids violation of possible future CMake policy checks regarding reserved/read-only variables.	2015-02-20 19:55:46 +01:00
Roman Donchenko	cf54e3b97e	Mark the libs component required ... Everything else depends on it, after all.	2015-02-20 18:37:21 +03:00
Roman Donchenko	6d52ea8984	Add component display names	2015-02-20 18:22:01 +03:00
Roman Donchenko	b8c60234c3	Update the CPack variables to match the changes in asmorkalov/CMake#1 ... Which also happens to align the non-Debian specific variables with the ones used by upstream CMake.	2015-02-20 18:21:47 +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
Alexander Nitsch	9665e08bac	Implement CMAKE_CURRENT_LIST_DIR for older CMake ... The use of built-in CMAKE_CURRENT_LIST_DIR requires at least CMake 2.8.3. This fix properly defines the variable to allow its use in versions < 2.8.3 as well. Fixes issue #4205.	2015-02-20 00:55:26 +01:00
Vadim Pisarevsky	a649aea82a	Merge pull request #3699 from SpecLad:rm-component-install	2015-02-18 13:55:07 +00:00
Vadim Pisarevsky	6b371865af	Merge pull request #3716 from mshabunin:fix-vs-solution-build	2015-02-18 13:48:18 +00:00
Vadim Pisarevsky	4fcfcfd002	Merge pull request #3663 from eliteraspberries:ffmpeg-dylib	2015-02-18 12:50:10 +00:00
Maksim Shabunin	2085251df2	Exclude object libraries from visual studio solution build	2015-02-18 14:16:54 +03:00
Maksim Shabunin	c41db69f98	Fixed cmake issues	2015-02-18 12:44:48 +03:00
Maksim Shabunin	553020c448	Enabled STL usage within the library	2015-02-18 12:36:50 +03:00
Roman Donchenko	49fe496914	Remove useless CPACK_*_COMPONENT_INSTALL variables ... They don't actually do anything. And even if they did, all components are enabled by default, anyway.	2015-02-13 15:31:19 +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
Maksim Shabunin	a5a510da4b	Support for compound modules, support for contrib_world	2015-02-10 18:30:05 +03:00
Vladislav Vinogradov	6a3f33090d	make color output in run_test script optional	2015-02-09 15:24:46 +03:00
Vladislav Vinogradov	682fdcfc9b	make color output in run_test script optional	2015-02-09 15:23:34 +03:00
Vladislav Vinogradov	098389d8eb	fix opencv_run_all_tests_unix.sh script: ... use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`, and `dash` doesn't support `PIPESTATUS` feature used in this sctipt	2015-02-06 12:36:18 +03:00
Vladislav Vinogradov	94d14c637f	fix opencv_run_all_tests_unix.sh script: ... use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`, and `dash` doesn't support `PIPESTATUS` feature used in this sctipt	2015-02-06 12:34:50 +03:00
Vadim Pisarevsky	98f9a013d1	Merge pull request #3674 from jet47:colorize-run-test-script-2.4	2015-02-05 07:35:01 +00:00
Mansour Moufid	c60fa84027	Add back the version variables removed in ab40630f.	2015-02-04 10:55:38 -05:00
Alexander Smorkalov	a87ccb9ac0	Added Debian changelog to -tests package.	2015-02-04 16:52:39 +03:00
Vladislav Vinogradov	a9325102a2	colorize opencv_run_all_tests_unix.sh script output	2015-02-04 12:39:51 +03:00
Vladislav Vinogradov	2b303f38a8	colorize opencv_run_all_tests_unix.sh script output	2015-02-04 12:38:51 +03:00
Alexander Smorkalov	e6ac64008b	Debian package names replaced by lower case version to satisfy lintian.	2015-02-04 11:56:29 +03:00
Mansour Moufid	8c68f1f626	Fix indentation of 98a157f5.	2015-02-03 23:17:43 -05:00
Mansour Moufid	98a157f589	Remove Apple-specific logic in finding the FFmpeg libraries. ... Thanks to SpecLad.	2015-02-03 23:14:11 -05:00
Mansour Moufid	a1cc9380e5	Correct the new find_library commands. ... Thanks to SpecLad.	2015-02-02 11:54:09 -05:00
Mansour Moufid	ab40630ff4	Use the CMake find_library command to find the FFmpeg libraries.	2015-02-01 15:51:33 -05:00
Alexander Smorkalov	cf852972d1	Fixed samples install permissions for Debian packaging.	2015-02-01 00:34:23 +03:00
Vadim Pisarevsky	1f47c22371	Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh	2015-01-31 14:46:40 +00:00
Vadim Pisarevsky	602b034a03	Merge pull request #3658 from asmorkalov:numpy_dependency	2015-01-31 14:45:11 +00:00
Alexander Smorkalov	ddc1b965b6	Added Debian changelog installation step for Debian package generation.	2015-01-30 13:21:52 +03:00
Alexander Smorkalov	be6b847675	Added dependency from numpy to debian package with python bindings.	2015-01-30 12:27:33 +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
Vadim Pisarevsky	f3311f9e2a	Merge pull request #3638 from jet47:remove-cuda-module	2015-01-28 18:51:32 +00:00
Vadim Pisarevsky	5cbdce97aa	Merge pull request #3645 from SeninAndrew:mp-msvs-fix	2015-01-28 18:50:39 +00:00
Andrew Senin	d08589d435	Fix for Visual Studio multiprocess builds for CMake versions > 2.8	2015-01-26 18:54:27 +04:00
Vladislav Vinogradov	482feb7266	FindCUDA fix : do not unset CACHE variables on first call ... This will allow to override CUDA CMake variables from first CMake call, like cmake -DCUDA_TOOLKIT_ROOT_DIR=... -DCUDA_CUDA_LIBRARY=...	2015-01-26 10:24:53 +03:00
Alexander Alekhin	0a07d780e0	ocl: OpenCL SVM support	2015-01-23 20:37:45 +03:00
Vladislav Vinogradov	fa23a01775	fix FindCUDA CMake module: ... do not unset variables if CUDA_TOOLKIT_TARGET_DIR is not defined	2015-01-23 19:17:00 +03:00
Vladislav Vinogradov	124ac15f1e	remove cuda module	2015-01-22 15:02:21 +03:00
Vadim Pisarevsky	03fc3d1ceb	Merge pull request #3591 from ilya-lavrenov:sse_avx	2015-01-21 10:46:23 +00:00
Vadim Pisarevsky	adbe84425f	Merge pull request #3622 from nagua:fix_find_gstreamer	2015-01-21 10:44:11 +00:00
Ilya Lavrenov	e9a6c5db21	sqsum	2015-01-20 21:10:06 +03:00
Vadim Pisarevsky	579ce93885	Merge pull request #3598 from caraffi:bug4108_testCasesLinkError	2015-01-20 12:59:34 +00:00
Vadim Pisarevsky	aacb9b7cf5	Merge pull request #3610 from jet47:fix-ocv_add_module-3.0	2015-01-20 12:35:36 +00:00
Vadim Pisarevsky	c29c52a216	Merge pull request #3609 from jet47:fix-ocv_add_module-2.4	2015-01-20 12:34:50 +00:00
Nicolas Riebesel	052fe626b3	Corrected the WITH_GSTREAMER and WITH_GSTREAMER_0_10 semantic	2015-01-18 20:27:09 +01:00
Vadim Pisarevsky	396f7e1a17	Merge pull request #3604 from asmorkalov:ocv_samples_package	2015-01-16 10:23:32 +00:00
Vladislav Vinogradov	698c367d8d	fix ocv_add_module CMake macro: ... it tries to remove 'opencv_' prefix from 'name' variable, but it creates new variable with the same name as module	2015-01-16 11:00:56 +03:00
Vladislav Vinogradov	12a3eb776d	fix ocv_add_module CMake macro: ... it tries to remove 'opencv_' prefix from 'name' variable, but it creates new variable with the same name as module	2015-01-16 10:59:52 +03:00
Vladislav Vinogradov	0376a8643e	fix CMake CMP0054 warning: ... ported from c105b72945	2015-01-15 18:40:33 +03:00
Alexander Smorkalov	6628714fc6	Fixed -samples debian package dependencies.	2015-01-15 15:36:45 +03:00
Claudio Caraffi	efc7dbaae2	Prevent linking failure, bug 4108	2015-01-14 11:55:41 +01:00
Vadim Pisarevsky	9cadc1e530	Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection	2015-01-13 11:25:32 +00:00
Ilya Lavrenov	f2cd65cf1e	fixes	2015-01-12 10:59:30 +03:00
Ilya Lavrenov	25e99c453f	avx2 in arithm	2015-01-12 10:59:30 +03:00
Ilya Lavrenov	612b8ce2cb	fixed compilation issues	2015-01-12 10:59:30 +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
Vladislav Vinogradov	d8272b9395	remove "-target-os-variant" NVCC option for CUDA 7.0 ... it is marked as obsolete	2015-01-12 10:58:43 +03:00
Alexander Smorkalov	c778011f14	More accurate AVX and AVX2 control. ... - Previous version just checked option support, but not enable it. - Also OpenCV tests reports invalid AVX and AVX2 support status.	2015-01-04 23:41:14 +03:00
Alexander Smorkalov	0f263e125b	Full AARCH64 support with NEON and new CUDA toolkit.	2014-12-28 11:51:33 +03:00
Maksim Shabunin	bebf6c47c6	Removed Sphinx generation commands from cmake scripts	2014-12-26 19:17:08 +03:00
Andrey Kamaev	7ec6d8a336	Fix Android build with the most resent android.toolchain.cmake	2014-12-25 12:41:17 +03:00
Andrey Kamaev	c105b72945	Assorted fixes: ... * cmake CMP0054 and CMP0045 * aarch64 build * portable code options in PCH cmake * some of gcc 4.9 warnings	2014-12-25 12:41:16 +03:00
Maksim Shabunin	128e509527	Added enviroment search paths for OpenNI2 for linux and fixed specific warning	2014-12-24 15:07:05 +03:00
Vadim Pisarevsky	214f633dd4	Merge pull request #3541 from jet47:find-cuda-update	2014-12-24 11:14:54 +00:00
Vadim Pisarevsky	8d4d36f805	Merge pull request #3538 from alalek:icv_fix_package	2014-12-24 09:00:32 +00:00
Vladislav Vinogradov	e4d0652899	[FindCUDA] improvements for cross-platform build ... * improve `CUDA_TARGET_CPU_ARCH` cache initialization, allow to override initial value from calling script; * add `CUDA_TARGET_OS_VARIANT` option to select OS variant; * add `CUDA_TARGET_TRIPLET` option to select target triplet from `${CUDA_TOOLKIT_ROOT_DIR}/targets` folder; * remove `CUDA_TOOLKIT_TARGET_DIR` option, now it is calculated from `CUDA_TARGET_TRIPLET`, the old approach still can be used for compatibility; * for CUDA 6.5 and newer try to locate static libraries too, because in 6.5 toolkit for ARM cross compilation only static libraries are included.	2014-12-23 17:48:18 +03:00
Vladislav Vinogradov	c4246bc59c	update FindCUDA CMake module to the latest version from upstream	2014-12-23 17:47:04 +03:00
Alexander Alekhin	864ec5ef45	IPPICV: don't use full paths in dependencies	2014-12-23 17:23:35 +03:00
Vadim Pisarevsky	fd6ef87c32	Merge pull request #3529 from jet47:fix-linux-install	2014-12-23 13:38:23 +00:00
Vadim Pisarevsky	5fea331d42	Merge pull request #3510 from boaz001:feature-4057	2014-12-22 10:27:33 +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
Ilya Lavrenov	ce81433aff	ability to enable OpenMP simultaneously with other parallel framework	2014-12-10 13:34:39 +03:00
Maksim Shabunin	c28fea32c7	Build separate world-like iOS framework for contrib	2014-12-05 17:48:28 +03:00
orestis	aad98e545f	Remove redundant -mfpu=neon flag. ... This flag is already added in line 131.	2014-11-19 23:26:36 +02:00
Philipp Hasper	799646e5d0	Typos in CMake	2014-11-17 12:30:12 +01:00
Daniel Sjölie	a9a45e1546	Merge remote-tracking branch 'upstream/master' into daniel	2014-11-14 13:44:06 +01:00
Michae Gharbi	28103ad386	Fix Cuda -Wl linker options ... This line causes the following error when building custom projects that use OpenCV beta 3: ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'	2014-11-11 12:12:28 -05:00
Vadim Pisarevsky	b80a3a91a8	Merge pull request #3401 from SpecLad:optflow-bogus-Warray-bounds	2014-11-11 13:27:41 +00:00
Roman Donchenko	13d67b6ae7	Suppress a bogus -Warray-bounds in modules/superres/src/optical_flow.cpp ... This is actually the same warning that the suppression at the bottom suppresses, but that one doesn't suppress it when using a native compiler (go figure). I remove the forced inclusion of precompiled headers into all sources, since otherwise this workaround doesn't work - the header with the warning is included before I can use a pragma.	2014-11-10 18:38:54 +03:00
Vadim Pisarevsky	3da1144cef	Merge pull request #3305 from tSed:opencv-2.4.x/opencv.pc-generation-refactoring	2014-11-06 08:41:07 +00:00
Samuel Martin	eceada586b	cmake/OpenCVGenPkgconfig.cmake: rework opencv.pc generation ... Using absolute path to locate the components in the "Libs:" field of the *.pc can badly break cross-compilation, especially when building statically linked objects. Indeed, pkg-config automatically replaces the '-I...' and '-L...' paths when the PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR environment variables are set [1]. This feature is very helpful and common in cross-compilation framework like Buildroot [2,3]. When there are absolute paths in the *.pc files, pkg-config won't be able to do the path substitions for these paths when the afromentioned environment variables are set. In such case, since the prefix is the target one, not the sysroot one, these libraries' abolute paths will point to: - in the best case: a non-existing file (i.e. these files do not exists on the host system; - at worst: the host system's libraries. This will make the linking failed because these host system's libraries will most likely not be build for the target architecture [4]. So, this patch replace the components' absolute paths by the form: -L<libdir> -l<libname> This way, the linker will be able to resolve each dependency path, whatever the kind of objects/build (shared object or static build) it is dealing with. Note that for static link, the library order does matter [5]. The order of the opencv components has been carefully chosen to comply with this requirement. Fixes #3931 [1] http://linux.die.net/man/1/pkg-config [2] http://buildroot.org/ [3] http://git.buildroot.net/buildroot/tree/package/pkgconf/pkg-config.in [4] http://autobuild.buildroot.net/results/e8a/e8a859276db34aff87ef181b0cce98916b0afc90/build-end.log [5] http://stackoverflow.com/questions/45135/linker-order-gcc Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- Note: this patch properly applies on top of the master branch, though it has been written on top of the 2.4 branch.	2014-11-05 11:32:11 +01:00
Daniel Sjölie	323c922322	Use OPENNI2_INCLUDE64 environment variable. ... (Set on windows with install from http://structure.io/openni).	2014-11-03 16:25:59 +01:00
Jose-Luis Blanco-Claraco	539acaf348	OpenCVConfig.cmake: Fix CMake CMP0012 warning ... "TRUE"/"FALSE" should not be used as literals, as CMake has to decide whether they are literals or variable names (sigh). This patch should make it work with any version of CMake and with any user-side decision on old vs. new policy behavior.	2014-10-28 09:46:18 +01:00
Maksim Shabunin	09fb7512ed	Fixed iOS framework compilation warnings	2014-10-27 15:28:21 +03:00
Vadim Pisarevsky	0cf170587f	Merge pull request #3363 from asmorkalov:qnx_support	2014-10-26 17:42:24 +00:00
Alexander Smorkalov	6bb6039ebb	Fixes for QNX 6.6 Neitrino support.	2014-10-23 17:17:35 +04:00
Vladislav Vinogradov	4f8a1213bd	determine test category (Public vs Extra) based on module location	2014-10-21 18:51:02 +04:00
Vladislav Vinogradov	edf54ac3a9	add CTest targets for sanity tests	2014-10-21 18:50:38 +04:00
Vladislav Vinogradov	f44c29ad7d	disable CTest target for opencv_test_viz: ... opencv_test_viz creates windows and waits until user close them, it is not appropriate for automatic testing	2014-10-21 18:49:53 +04:00
Vladislav Vinogradov	0c57dc2e00	rewrite add_test command for accuracy tests: ... * use new syntax introduced in CMake 2.8.0 * set OPENCV_TEST_DATA_PATH enviroment property	2014-10-21 18:48:46 +04:00
Maksim Shabunin	571ebb2373	Fixing iOS clang warnings, part 3	2014-10-17 18:15:21 +04:00
Maksim Shabunin	ef3d02214b	Fixing iOS clang warnings, part 2	2014-10-17 18:14:54 +04:00
Maksim Shabunin	630eddf25a	Extracted repeated cmake instruction block	2014-10-17 18:14:53 +04:00
Vladislav Vinogradov	f55c1cc0fb	fix installation layout for debian packages: ... Install symlinks to shared libraries as a part of development package, not runtime package. It is default behavior for debian packages.	2014-10-17 13:23:23 +04:00
Samuel Martin	38bb0db9db	cmake: fix gstreamer check conditions ... The current situation of the Gstreamer detection does not always honor all the configurations set by the user, among this: - if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are off, but Gstreamer 0.10 is installed in the system, Gstreamer 0.10 support will be enable; - if both WITH_GSTREAMER and WITH_GSTREAMER_0_10 are on, only checks for Gstreamer 0.10 will be run. This patch fixes the Gstreamer detection like this: | -DWITH_... | Package installed || OpenCV | | GSTREAMER | GSTREAMER_0_10 | gst-1.x | gst-0.10 || gst. support | +===========+================+=========+==========##==============+ | OFF | OFF | - | - || none | | OFF | ON | - | no || none | | OFF | ON | - | yes || gst-0.10 | | ON | OFF | no | no || none | | ON | OFF | no | yes || gst-0.10 | | ON | OFF | yes | - || gst-1.x | | ON | ON | yes | - || gst-1.x | Signed-off-by: Samuel Martin <s.martin49@gmail.com>	2014-10-06 21:40:55 +02:00
Maksim Shabunin	b8457be394	Merge pull request #3216 from xantares:patch-1	2014-10-02 13:25:06 +00:00
Roman Donchenko	d54d580f79	Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport	2014-09-30 15:55:26 +00:00
xantares	9d13c7b1e2	Move cmake config files too on non-windows hosts.	2014-09-30 09:36:37 +00:00
Alexander Smorkalov	1f4fe3bb27	GStreamer 1.0 backport from master branch.	2014-09-30 12:30:09 +04:00
Alexander Smorkalov	1c3c94fd2c	Exclude OpenCL tests from default test list for Android as they are experimental.	2014-09-29 20:45:12 +04:00
Alexander Smorkalov	1cc80f10ba	Added implicit dependency from python and python-py to debian packages.	2014-09-29 17:43:54 +04:00
Artur Wieczorek	302b138aa7	CMake configuration for MSMF capture ... Applied in PR3247 to 2.4 branch.	2014-09-25 12:05:54 +02:00
Artur Wieczorek	7c354c14f7	CMake configuration for MSMF capture	2014-09-21 21:03:41 +02:00
Vadim Pisarevsky	a67484668e	Merge pull request #2711 from GregoryMorse:patch-5	2014-09-18 11:28:58 +00:00
Vadim Pisarevsky	26fd37b27d	Merge pull request #3212 from mshabunin:python_cross_build_2.4	2014-09-18 08:57:32 +00:00
Vadim Pisarevsky	8d61ecbc4d	Merge pull request #3205 from parafin:ximea_unix-3.0	2014-09-14 18:44:41 +00:00
Maksim Shabunin	1b4e3ec35a	Changed cmake python library search startegy for crosscompiling	2014-09-12 13:44:16 +04:00
Andrey Pavlenko	79f593a429	Merge pull request #3198 from mshabunin:java_test_fix	2014-09-11 16:15:25 +00: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
Maksim Shabunin	b3bae170ed	Fixed java tests build ... - disabled xfeature2d dependency for java wrappers - fixed java wrappers build after cmake rerun - disabled opencv_ml tests temporarily - fixed Imgproc usage in java tests	2014-09-08 18:30:03 +04:00
Alexander Smorkalov	35768ed638	Python tests added to -tests deb package.	2014-09-08 18:11:12 +04:00
Maksim Shabunin	2c2cdcf789	Changed cmake python library search startegy for crosscompiling	2014-09-04 16:29:46 +04:00
Alexander Smorkalov	634ffed488	Several fixes for lintian varnings	2014-08-22 10:53:33 +04:00
Ling Wang@z77x	a218bdb0d7	fix cmake ocv_add_samples for opencv_contrib/modules/bioinspired ... If a sample containing subdirs, a Cmake error will be raised, since the original code can only install FILES.	2014-08-20 08:36:44 -07:00
Alexander Alekhin	cf4a536440	Merge pull request #3098 from jet47:fix-cuda-compilation	2014-08-14 10:05:49 +00:00
mshabunin	3ed89a8879	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
Vladislav Vinogradov	8392296eda	remove -fvisibility-inlines-hidden from CUDA compiler flags ... it generates warning	2014-08-13 18:08:48 +04:00
Vladislav Vinogradov	f5d9359da8	use directory-based include_directories command if we build with CUDA	2014-08-13 18:08:08 +04:00
Vladislav Vinogradov	0825120f6a	move CUDA compilation step from ocv_glob_module_sources to ocv_add_library	2014-08-13 18:07:31 +04:00
Alexander Alekhin	b3a54d588b	fix binary package build	2014-08-08 17:24:59 +04:00
arc	3d0a270a66	Merge branch 'master' into python2and3	2014-08-07 01:04:26 -04:00
Alexander Alekhin	55188fe991	world fix	2014-08-05 20:12:35 +04:00
Michael Pratt	c9876c3cd8	Merge branch 'master' into python2and3	2014-07-31 01:13:16 -04:00
Fco. Javier Delgado del Hoyo	b8bc99676d	Another typo in comment inside OpenNI2 cmake file	2014-07-29 11:13:00 +02:00
Fco. Javier Delgado del Hoyo	6e4562bb56	Fixed typo in OpenNI2 cmake file	2014-07-29 11:10:58 +02:00
Vadim Pisarevsky	fc41e8850b	Merge pull request #2836 from s98felix:2.4	2014-07-25 12:59:41 +00:00
Alexander Smorkalov	daff2a0674	More accurate deb package build fix for CUDA 6.5 and newer. ... (cherry picked from commit b2790973a3) (cherry picked from commit f8758da289)	2014-07-24 15:08:29 +04:00
Alexander Smorkalov	ad5c2de97c	Deb package build fix for CUDA 6.5 and newer. ... (cherry picked from commit e650d87e47) (cherry picked from commit ca9c52ac97)	2014-07-24 15:08:27 +04:00
Richard Yoo	de37cfc224	Enable Intel AVX/AVX2 compilation on Windows.	2014-07-21 13:26:50 -07:00
Lars Glud	4dcd37f699	Merge remote-tracking branch 'origin/master' into Openni2Support ... Conflicts: modules/highgui/CMakeLists.txt modules/highgui/include/opencv2/highgui.hpp modules/highgui/include/opencv2/highgui/highgui_c.h	2014-07-20 14:28:10 +02:00
Vadim Pisarevsky	9a58b1a3a0	Merge pull request #2925 from BloodAxe:osx-framework-script	2014-07-19 18:04:15 +00:00
Lars Glud	8b32235854	Openni2 support	2014-07-16 12:37:53 +02:00
vbystricky	d58f736935	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
Richard Yoo	c38023f4e7	Modifications to support dynamic vector dispatch.	2014-07-09 16:55:39 -07:00
Roman Donchenko	023102c804	cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both ... How this worked before, I do not know.	2014-07-09 16:55:40 +04:00
vbystricky	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
Marvin Smith	14548227ca	Adding support for GDAL raster images.	2014-07-01 16:29:11 -07:00
Ievgen Khvedchenia	92ead5fab3	Fix cmake to build OpenCV framework on OSX	2014-07-01 22:31:57 +03:00
Michael Pratt	cac1218eef	Build both Python 2 and Python 3 bindings ... If both Python 2 and Python 3 are found, then build bindings for both of them during the build process. Currently, one version of Python is detected automatically, and building for the other requires changes the CMake config. The largest chunk of this change generalizes OpenCVDetectPython.cmake to find both a Python 2 and Python 3 version of Python. Secondly, the opencv_python module is split into two modules, opencv_python2 and opencv_python3. Both are built from the same source. but for different versions of Python.	2014-06-29 20:08:13 -04:00
Richard Yoo	11a09ef5cc	Changes to support Intel AVX/AVX2 in cvResize().	2014-06-06 15:39:09 -07:00
Alexander Alekhin	15b6fd2ec4	android: allow to build & run examples without Android OpenCV Manager	2014-06-06 18:01:04 +04:00
Roman Donchenko	85edb9e9b1	Merge pull request #1552 from Exocoder:gtk3	2014-06-04 12:07:17 +04:00
Alexander Alekhin	ab2749d648	Merge pull request #2709 from alalek:icv_update_binary_pack	2014-05-23 15:09:43 +04:00
Roman Donchenko	3d7a457c97	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/introduction/linux_install/linux_install.rst modules/core/doc/operations_on_arrays.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/gpu/src/cuda/resize.cu modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/video/src/bgfg_gaussmix2.cpp	2014-05-19 18:39:20 +04:00
Alexander Alekhin	6f798b1ba7	icv: android x86 build	2014-05-13 18:28:13 +04:00
Vladislav Vinogradov	67b562d543	fix OpenCVConfig.cmake template - missing parentheses	2014-05-13 11:37:21 +04:00
Alexander Smorkalov	e8376c789d	Fix non-Android cross compilation with OpenCVConfig.cmake	2014-05-12 15:45:02 +04:00
Alexander Alekhin	df9aa8898d	icv: fix OpenCV Windows package	2014-05-07 15:20:29 +00:00
Alexander Alekhin	07d5f56707	Merge pull request #2679 from alalek:ippicv_update	2014-05-07 18:24:41 +04:00
Alexander Alekhin	5658ba0002	icv: update package	2014-04-29 15:35:27 +04:00
Abhijit Kundu	26c8b3a38e	Added suuport for finding Intel TBB for Visual Studio 2013	2014-04-28 07:23:49 -04:00
Vadim Pisarevsky	4eede18027	Merge pull request #2606 from alalek:icv_downloader	2014-04-15 13:20:04 +04:00
Tony	265148b974	Correction to enable compilation on platform with only GTK2 libs ... modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	2014-04-13 11:11:05 +01:00
Tony	cb4fffc72a	Fix logic error in OpenCVFindLibsGUI.cmake ... When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.	2014-04-13 11:08:32 +01:00
Tony	c0dbc083ea	Correct error with GTK3 not found selection ... When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum version requirements) is present. Selection logic for printing 'GTK: No' when the libraries are not found has also been removed so the message is printed when GTK is not found or selected in common with other libraries. Changes committed: modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake	2014-04-13 11:08:31 +01:00
Tony	f318b5bc9d	Improve GTK+ library selection logic. ... The new logic will select GTK+3 by default if WITH_GTK is selected. If the GTK+3 libraries are not found, then GTK+2 libraries will be selected if found. This can be overridden by using WITH_GTK_2_X to force selection of GTK+2 (if found).	2014-04-13 11:04:56 +01:00
Tony	1638341270	Use GTK_VERSION_MAJOR to switch between GTK+ version two and three ... specific code. As a result of this, HAVE_GTK3 no longer needs to be exposed. The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the method used by HAVE_QT and HAVE_QT5. On branch gtk3 Changes to be committed: modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake modified: cmake/templates/cvconfig.h.in modified: modules/highgui/src/window.cpp modified: modules/highgui/src/window_gtk.cpp	2014-04-13 11:04:56 +01:00
Tony	befdef9685	Merge remote-tracking branch 'upstream/master' ... Rebase to lates upstream	2014-04-13 10:39:32 +01:00
Alexander Alekhin	047d285b7d	ICV: added package downloader	2014-04-11 14:19:18 +04:00
Vadim Pisarevsky	604a64b206	Merge pull request #2390 from nicolasmartin3d:master_bug3546	2014-04-10 13:33:43 +04:00
Tony	34984328fd	Merge remote-tracking branch 'upstream/master' ... Conflicts: CMakeLists.txt	2014-04-10 08:07:02 +01:00
Alexander Alekhin	1461ab41bc	ipp: added support for updated ICV package	2014-04-09 18:20:49 +04:00
Ilya Lavrenov	444ab0ef0d	fixed (IppiSize&)sz	2014-04-09 00:19:56 +04:00
Ilya Lavrenov	c735594178	cv::scaleAdd	2014-04-09 00:12:48 +04:00
Ilya Lavrenov	f1b38c4198	cv::warpPerspective and cv::warpAffine	2014-04-09 00:11:26 +04:00
Tony	3cd50739ef	Merge remote-tracking branch 'upstream/master'	2014-04-08 19:14:05 +01:00
Andrey Pavlenko	9ec823d800	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
Tony	572e4f5255	Merge remote-tracking branch 'upstream/master'	2014-04-06 11:49:23 +01:00
Alexander Alekhin	bfc546d23c	enable IPP ICV support	2014-04-03 15:05:38 +04:00
Elena Gvozdeva	037ac27ec8	Added SharedMatrix	2014-04-03 14:53:27 +04:00
Elena Gvozdeva	fa2d79a15b	Added IPP Async converters, doc and sample	2014-04-01 16:47:29 +04:00
Roman Donchenko	f77c68e0fa	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp	2014-03-31 14:42:00 +04:00
Alexander Smorkalov	b852108262	OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.	2014-03-28 18:57:21 +04:00
Tony	46ba9d30b9	Merge remote-tracking branch 'upstream/master'	2014-03-25 20:44:06 +00:00
Roman Donchenko	cc05493730	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectAndroidSDK.cmake cmake/OpenCVGenAndroidMK.cmake cmake/OpenCVModule.cmake cmake/templates/OpenCV.mk.in cmake/templates/OpenCVConfig.cmake.in doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst modules/cudabgsegm/src/cuda/mog.cu modules/imgproc/perf/opencl/perf_filters.cpp modules/imgproc/src/opencl/filterSep_singlePass.cl modules/nonfree/CMakeLists.txt modules/nonfree/perf/perf_precomp.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/filtering.cpp modules/ocl/src/opencl/bgfg_mog.cl modules/superres/CMakeLists.txt modules/superres/src/btv_l1_cuda.cpp modules/superres/src/cuda/btv_l1_gpu.cu modules/superres/src/frame_source.cpp modules/superres/src/input_array_utility.cpp modules/superres/src/optical_flow.cpp modules/superres/src/precomp.hpp samples/gpu/CMakeLists.txt samples/gpu/brox_optical_flow.cpp samples/gpu/super_resolution.cpp	2014-03-24 19:02:16 +04:00
Alexander Smorkalov	64d679ecb4	Added guard to prevent from gpu module redefinition in OpenCV.mk	2014-03-22 05:41:29 +04:00
Alexander Smorkalov	b0ad84cfa2	Libraries filter update after abs path cut.	2014-03-21 12:48:38 +04:00
Alexander Smorkalov	284b2fc1e7	Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.	2014-03-19 18:47:32 +04:00
Roman Donchenko	a1e5bd71f1	Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control	2014-03-19 14:49:22 +04:00
Alexander Smorkalov	b4e4f13f9e	Superres module enabled for Android. GPU samples build fixed for Android.	2014-03-18 17:07:19 +04:00
Roman Donchenko	ae036838dd	Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix	2014-03-17 14:43:15 +04:00
Alexander Smorkalov	6b8de222d7	OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.	2014-03-17 14:32:32 +04:00
Roman Donchenko	40a740ff88	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/imgproc/src/opencl/precornerdetect.cl modules/nonfree/perf/perf_main.cpp modules/nonfree/perf/perf_surf.ocl.cpp modules/ocl/src/arithm.cpp modules/ocl/src/gftt.cpp modules/ocl/src/opencl/arithm_bitwise.cl modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl modules/ocl/src/opencl/arithm_minMax.cl modules/ocl/src/opencl/arithm_nonzero.cl modules/ocl/src/opencl/arithm_sum.cl modules/ocl/test/test_arithm.cpp modules/viz/src/precomp.hpp modules/viz/src/vizcore.cpp modules/viz/src/vtk/vtkCloudMatSink.h modules/viz/src/vtk/vtkXYZReader.cpp modules/viz/src/vtk/vtkXYZReader.h modules/viz/test/test_precomp.hpp	2014-03-17 14:14:07 +04:00
Roman Donchenko	836635d2d5	Merge pull request #2434 from Nerei:viz_continue	2014-03-12 16:53:42 +04:00
Anatoly Baksheev	4d7a593c25	minor cmake fix fo macos	2014-03-12 16:22:22 +04:00
Alexander Smorkalov	b3e18d23a3	Implicit CUDA and OpenCL control for module definition added. ... Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.	2014-03-06 10:31:33 +04:00
Roman Donchenko	48432502b6	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectCUDA.cmake doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst modules/core/CMakeLists.txt modules/features2d/perf/opencl/perf_brute_force_matcher.cpp modules/highgui/src/grfmt_tiff.cpp modules/imgproc/src/clahe.cpp modules/imgproc/src/moments.cpp modules/nonfree/CMakeLists.txt modules/ocl/perf/perf_ml.cpp modules/superres/CMakeLists.txt	2014-02-25 15:02:24 +04:00
Nicolas Martin	67cf0dabea	Do not build apple objective-c codes if using gcc	2014-02-24 09:44:49 -05:00
Roman Donchenko	7cbc4e88de	Merge pull request #2357 from akarsakov:fix_ipp_compilation_linux	2014-02-19 12:02:41 +04:00
Roman Donchenko	5cb2d1c20d	Merge pull request #2338 from asmorkalov:ocv_gcov	2014-02-18 14:25:16 +04:00
Alexander Smorkalov	de6d13088f	gcov tool support added.	2014-02-18 12:59:41 +04:00
Alexander Karsakov	01a980aa9e	Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.	2014-02-17 16:56:02 +04:00
Roman Donchenko	029ffb7c2d	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/src/gl_core_3_1.cpp modules/core/src/opencl/convert.cl modules/cudaimgproc/src/cuda/canny.cu modules/cudastereo/perf/perf_stereo.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/test/test_denoising.cpp modules/ocl/src/opencl/imgproc_resize.cl samples/cpp/Qt_sample/main.cpp	2014-02-17 15:24:05 +04:00
Vladislav Vinogradov	8b8c368148	fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)	2014-02-14 17:56:03 +04:00
Roman Donchenko	fa272c43c2	Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host	2014-02-14 15:37:09 +04:00
Stuart Cunningham	55b9c0374c	Fix cmake detection of build platform endianness ... Improve comments to indicate actual usage of WORDS_BIGENDIAN where it is tested with #ifdef rather than #if	2014-02-13 22:59:30 +11:00
Alexander Smorkalov	d02c291160	opencv_run_all_tests.sh implemented for Android SDK.	2014-02-12 14:21:58 +04:00
Ilya Lavrenov	281666887e	typo	2014-02-11 14:25:37 +04:00
Roman Donchenko	72aabb8a84	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt cmake/OpenCVGenAndroidMK.cmake cmake/templates/OpenCV.mk.in doc/tutorials/viz/creating_widgets/creating_widgets.rst doc/tutorials/viz/launching_viz/launching_viz.rst doc/tutorials/viz/table_of_content_viz/images/image_effects.png doc/tutorials/viz/transformations/transformations.rst doc/tutorials/viz/widget_pose/widget_pose.rst modules/core/include/opencv2/core/affine.hpp modules/core/include/opencv2/core/core.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/cuda/canny.cu modules/gpu/src/cuda/generalized_hough.cu modules/gpu/src/generalized_hough.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_color.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_gpumat.cpp modules/gpu/test/test_hough.cpp modules/nonfree/CMakeLists.txt modules/nonfree/include/opencv2/nonfree/gpu.hpp modules/nonfree/perf/perf_gpu.cpp modules/nonfree/src/cuda/surf.cu modules/nonfree/src/precomp.hpp modules/nonfree/src/surf_gpu.cpp modules/nonfree/test/test_gpu.cpp modules/ocl/perf/perf_haar.cpp modules/stitching/CMakeLists.txt modules/stitching/include/opencv2/stitching/detail/matchers.hpp modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp modules/stitching/include/opencv2/stitching/detail/warpers.hpp modules/stitching/include/opencv2/stitching/warpers.hpp modules/stitching/src/blenders.cpp modules/stitching/src/matchers.cpp modules/stitching/src/precomp.hpp modules/stitching/src/seam_finders.cpp modules/stitching/src/stitcher.cpp modules/stitching/src/warpers.cpp modules/viz/doc/widget.rst modules/viz/include/opencv2/viz/types.hpp modules/viz/include/opencv2/viz/viz3d.hpp modules/viz/include/opencv2/viz/widget_accessor.hpp modules/viz/src/precomp.hpp modules/viz/src/shapes.cpp modules/viz/src/vizcore.cpp modules/viz/src/vtk/vtkCloudMatSink.h modules/viz/src/vtk/vtkCloudMatSource.h modules/viz/test/test_precomp.hpp modules/viz/test/tests_simple.cpp samples/android/tutorial-4-cuda/CMakeLists.txt samples/android/tutorial-4-cuda/jni/Android.mk samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java samples/cpp/stitching_detailed.cpp samples/cpp/tutorial_code/viz/creating_widgets.cpp samples/cpp/tutorial_code/viz/launching_viz.cpp samples/cpp/tutorial_code/viz/transformations.cpp samples/cpp/tutorial_code/viz/widget_pose.cpp	2014-02-11 12:05:01 +04:00
Anatoly Baksheev	5dc17f5d58	Fixed all OpenGL issues for Macos (via objective-C++ layer)	2014-02-10 15:45:46 +04:00
Anatoly Baksheev	975a6299fa	More proper OpneCv+Qt+Vtk issues handling (http://code.opencv.org/issues/3492)	2014-02-10 15:45:44 +04:00
Alexander Smorkalov	b10d4b05ed	dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.	2014-02-07 12:46:24 +04:00
Roman Donchenko	7daf26d398	Merge pull request #2269 from Nerei:qt5_vtk_guards	2014-02-06 16:47:15 +04:00
Roman Donchenko	34b02f6437	Merge pull request #2276 from asmorkalov:android_install_cuda	2014-02-06 16:45:49 +04:00
Alexander Smorkalov	6ae4a9b09b	Multiple improvements in OpenCV examples build. ... EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project; INSTALL_CUDA_LIBRARIES option added to OpenCV.mk opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed; CUDA initialization apportunity added to OpenCVLoader.initDebug(); Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.	2014-02-06 15:32:57 +04:00
Roman Donchenko	e91b818e3e	Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix	2014-02-06 14:59:31 +04:00
Alexander Smorkalov	530702c5f2	Absolute path to tests in opencv_run_app_tests.sh fixed.	2014-02-06 12:35:14 +04:00
Roman Donchenko	feed2c074d	Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix	2014-02-06 12:20:08 +04:00
Alexander Smorkalov	65b4d77959	project.properties file generation fixed for per-component installation.	2014-02-05 17:34:19 +04:00
Ilya Lavrenov	c7fe162829	renamed **2 -> **	2014-02-04 19:55:11 +04:00
Vladislav Vinogradov	286fe261d0	save previous values of LOCAL_* variables and restore them at the end	2014-02-04 10:29:43 +04:00
Vladislav Vinogradov	a098fb1803	fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)	2014-02-04 10:29:15 +04:00
Vadim Pisarevsky	b8c6adc569	Merge pull request #2178 from Nerei:viz_backport	2014-02-03 16:16:51 +04:00
Roman Donchenko	2bbda9d225	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/cudaimgproc/test/test_color.cpp modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_imgproc.cpp modules/java/generator/src/cpp/VideoCapture.cpp samples/gpu/performance/CMakeLists.txt samples/tapi/CMakeLists.txt	2014-02-03 13:23:59 +04:00
Anatoly Baksheev	0a870faf28	added guard against linking qt5 and VTK together	2014-02-02 16:23:33 +04:00
Alexander Smorkalov	3d261e8a01	Reports path fix for opencv_run_all_tests.sh.in script.	2014-01-31 13:17:12 +04:00
Roman Donchenko	0dad2876e2	Removed all use of the obsolete IMMEDIATE parameter to configure_file. ... It's not documented, and it does nothing unless CMake 2.0 compatibility is enabled (and it isn't): https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx	2014-01-29 19:34:02 +04:00
Alexander Smorkalov	d45350a06a	opencv_run_all_tests.sh script added to -tests package.	2014-01-29 16:31:24 +04:00
Alexander Smorkalov	d9dc5ffa91	Multiple fixes for tests deb package build. ... Added opencv_testing.sh.in file; opencv_testing.sh installation guarded by OS check.	2014-01-28 16:32:26 +04:00
Alexander Smorkalov	39201e68e2	Code review notes fixed. ... Env setup for testing package implemented using /etc/profile.d; Variable with path for all native samples added; Path for test binaries and test data updated.	2014-01-27 18:47:09 +04:00
Alexander Smorkalov	f332cba14b	OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.	2014-01-27 15:49:24 +04:00
Roman Donchenko	bbc35d609d	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectPython.cmake cmake/OpenCVModule.cmake modules/core/src/gpumat.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/CMakeLists.txt modules/gpu/src/cuda/generalized_hough.cu modules/gpu/src/generalized_hough.cpp modules/python/CMakeLists.txt	2014-01-27 15:28:14 +04:00
Ilya Lavrenov	cc514ac7a9	added new macros useful for tracking whether OpenCL impl run or not	2014-01-24 17:16:40 +04:00
Roman Donchenko	24caa80143	Merge pull request #2197 from asmorkalov:ocv_packaging2	2014-01-24 14:27:44 +04:00
Alexander Smorkalov	086792ec06	Improvements in package build.	2014-01-24 12:00:44 +04:00
Anatoly Baksheev	9145985ff4	added guard to prevent linking VTK with Qt5	2014-01-23 16:40:24 +04:00
Roman Donchenko	3715f71aaf	Merge pull request #2175 from vrabaud:2.4	2014-01-23 13:27:38 +04:00
Vincent Rabaud	167a26642e	fix message sent to user during cross_compilation	2014-01-22 15:26:14 +01:00
Alexander Smorkalov	7821fe2bde	Initial Linux packages build rools for CPack.	2014-01-21 20:34:36 +04:00
Alexander Smorkalov	b75cbfde45	All installed files marked with component names for install customization.	2014-01-21 20:34:36 +04:00
Vincent Rabaud	eabcfa5652	reorder the if's for clarity	2014-01-21 10:27:37 +01:00
Vincent Rabaud	6cb90c0e97	fix cross-compilation issue with Numpy	2014-01-21 10:07:19 +01:00
Anatoly Baksheev	02ebc4368c	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00
Anatoly Baksheev	8d327fa497	updated for compatibility with VTK6.0	2014-01-19 18:38:58 +04:00
Roman Donchenko	9e3673ef53	Don't use PYTHON_VERSION_STRING when searching for Python libraries ... It may be an arbitrary string, and, for example, in Ubuntu 13.10 it's set to "2.7.5+", which breaks the find script.	2014-01-10 18:40:47 +04:00
Roman Donchenko	7f795e964f	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00
Roman Donchenko	719149877e	Merge pull request #2074 from asmorkalov:android_nonfree_cuda	2013-12-27 12:43:49 +04:00
Roman Donchenko	ee36717db4	Merge pull request #2037 from GregoryMorse:patch-2	2013-12-27 12:11:52 +04:00
Alexander Smorkalov	c48777a1c3	CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.	2013-12-27 11:18:10 +04:00
GregoryMorse	4880858119	Update CMakeLists.txt ... WinRT native C++ support allowing building of static libraries Update CMakeLists.txt Update OpenCVCRTLinkage.cmake Update OpenCVCRTLinkage.cmake	2013-12-26 19:45:21 +08:00
Roman Donchenko	86aabf704f	Merge pull request #2050 from asmorkalov:android_mk_fix2	2013-12-26 14:16:29 +04:00
Alexander Smorkalov	358e59e91b	Fake dependency from CUDA in case of satic linkage with OpenCV removed.	2013-12-26 13:07:53 +04:00
Roman Donchenko	83fe2f3b16	Fixed the seporate/seporator typo everywhere.	2013-12-25 14:04:44 +04:00
Roman Donchenko	3c4b24d531	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp	2013-12-23 18:50:17 +04:00
Alexander Smorkalov	51d3138dff	OCV option ENABLE_DYNAMIC_CUDA mistake fix.	2013-12-23 16:40:31 +04:00
Alexander Smorkalov	58e7d9f32f	OpenCV.mk fixed for accurate CUDA support.	2013-12-23 12:58:12 +04:00
Roman Donchenko	f22d9a232d	Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda	2013-12-23 12:45:49 +04:00
Roman Donchenko	6e22be4100	Merge pull request #2003 from vbystricky:intelperc_camera_2.4	2013-12-20 17:06:27 +04:00
Alexander Smorkalov	9941c6710d	NEON instruction set control unified for regular and cross-compiler builds.	2013-12-20 16:02:37 +04:00
Alexander Smorkalov	037ffcdf99	Dynamic CUDA support library reimplemented as OpenCV module.	2013-12-19 16:42:11 +04:00
Vladimir Bystricky	d449ba104a	Fix comment in the cmake file from SSDK to SDK	2013-12-19 10:29:19 +04:00
Alexander Smorkalov	6da7c50fb5	Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.	2013-12-19 10:27:38 +04:00
Vladimir Bystricky	cc08e00876	Fix notes about cmake files. Fix build warning.	2013-12-17 16:13:55 +04:00
Vladimir Bystricky	e8d2a9752b	Add support Creative Senz3D camera by Intel Perceptual Computing SDK	2013-12-13 17:25:16 +04:00
Alexander Alekhin	cc69d4631a	cmake: detect Direct 3D 11	2013-12-13 15:57:31 +04:00
Roman Donchenko	f3ba1a361e	Merge pull request #1930 from alalek:cmake_msvs_subfolders	2013-12-09 16:21:16 +04:00
Anatoly Baksheev	a54ef70c04	minor insignificant corrections	2013-12-07 18:58:28 +04:00
Anatoly Baksheev	0e88733b13	updating Viz cmake (switched to WITH_VTK option)	2013-12-07 18:58:27 +04:00
Alexander Alekhin	0eb2be762a	cmake: allow source_group to preserve file-system tree (for MSVS)	2013-12-07 14:38:59 +04:00
Dirk Van Haerenborgh	8a48802dec	Enable GStreamer 1.x support by default. ... GStreamer 1.x is universally available, and with 0.10 being deprecated, there should be no reason to default to 0.10 stil.	2013-12-06 10:20:29 +01:00
Roman Donchenko	d58cd9851f	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt cmake/OpenCVDetectCUDA.cmake doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst modules/core/src/cmdparser.cpp modules/gpu/CMakeLists.txt modules/gpu/doc/introduction.rst modules/gpu/perf/perf_video.cpp modules/highgui/doc/reading_and_writing_images_and_video.rst modules/ocl/src/cl_context.cpp modules/video/include/opencv2/video/background_segm.hpp samples/cpp/image_sequence.cpp samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp samples/python/chessboard.py samples/python/cvutils.py samples/python/demhist.py samples/python/dft.py samples/python/distrans.py samples/python/edge.py samples/python/ffilldemo.py samples/python/fitellipse.py samples/python/houghlines.py samples/python/inpaint.py samples/python/logpolar.py samples/python/morphology.py samples/python/numpy_array.py samples/python/watershed.py	2013-12-03 17:35:21 +04:00
Roman Donchenko	790f53f12a	Merge pull request #1887 from jet47:android-cuda-6.0	2013-12-02 18:53:26 +04:00
Alexander Smorkalov	d39e73365c	Some debug options are removed because they are installed by Cmake automatically. ... Also forcing -ggdb3 on android leads to debuging issues.	2013-11-29 15:34:50 +04:00
Vladislav Vinogradov	5ac8444c22	fixed CUDA_TOOLKIT_TARGET_DIR for android: ... use targets/armv7-linux-androideabi is exists	2013-11-28 13:35:23 +04:00
Vladislav Vinogradov	81acc5e73e	added -Xptxas;-dlcm=ca and -target-os-variant=Android to nvcc flags	2013-11-28 10:00:55 +04:00
Vladislav Vinogradov	26cb0ce1d5	fixed compilation warnings in .cu files	2013-11-28 10:00:48 +04:00
Vladislav Vinogradov	20641b4a0b	fixed CC arch/pts for android (used sm_32)	2013-11-28 10:00:47 +04:00
Tony	69dc840583	mprove Gtk2/3 options in cmake ... Update to cmake files for to include minimum versions, and tidy up gtk operation. Files updated: CMakeLists.txt: WITH_GTK now uses Gtk3 by default. If not found then Gtk2 is used. WITH_GTK_2_X forces Gtk2.x use cmake/OpenCVFindLibsGUI.cmake Updated selection logic to implement methodology described above. Implemented warning if Gtk3 not found (and not overridden) Implemented error if Gtk does not meet minimum required version cmake/OpenCVMinDepVersions.cmake Added minimum Gtk version of 2.18.0	2013-11-26 21:35:03 +00:00
Roman Donchenko	9c2272d520	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: .gitignore CMakeLists.txt doc/CMakeLists.txt modules/calib3d/src/stereosgbm.cpp modules/core/include/opencv2/core/mat.hpp modules/highgui/src/cap_openni.cpp modules/ml/include/opencv2/ml/ml.hpp modules/objdetect/src/hog.cpp modules/ocl/perf/perf_color.cpp modules/ocl/src/arithm.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/optical_flow_farneback.cpp platforms/scripts/camera_build.conf platforms/scripts/cmake_android_all_cameras.py samples/cpp/Qt_sample/main.cpp samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp	2013-11-26 15:05:26 +04:00
Roman Donchenko	75fba08042	Merge pull request #1822 from SpecLad:msvc12	2013-11-25 12:19:58 +04:00
Alexander Alekhin	881e837520	ocl/core: added prototype for tests	2013-11-22 18:37:44 +04:00
Roman Donchenko	b8f5fcf3f9	Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea	2013-11-21 12:03:02 +04:00
Andrey Pavlenko	8d1a8df1a9	Merge pull request #1824 from vpisarev:ocl_experiments5	2013-11-20 19:14:40 +04:00
Roman Donchenko	3703c7040a	Merge pull request #1828 from SpecLad:merge-2.4	2013-11-20 16:08:53 +04:00
Roman Donchenko	95006af170	Merge pull request #1816 from SpecLad:no-more-epoch	2013-11-20 11:52:54 +04:00
Roman Donchenko	ef27ac3782	In the example in OpenCVConfig.cmake.in, explicitly add the include paths. ... After #1801, the include directories are no longer added automatically, so we should show the user how to do that.	2013-11-19 19:00:56 +04:00
Roman Donchenko	7f935717cb	In OpenCVConfig.cmake.in, lowercased the commands in the example. ... This is the preferred style nowadays, and more consistent with the rest of the code.	2013-11-19 18:58:33 +04:00
Roman Donchenko	4037a4f227	Fixed OpenCV_LIBS when find_package has been used with explicit components. ... Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.	2013-11-19 18:44:17 +04:00
Roman Donchenko	aacf188e83	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/arithm.cpp modules/ocl/src/build_warps.cpp modules/ocl/src/color.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_color.cpp samples/cpp/3calibration.cpp samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp samples/cpp/Qt_sample/main.cpp samples/cpp/camshiftdemo.cpp samples/cpp/descriptor_extractor_matcher.cpp samples/cpp/distrans.cpp samples/cpp/generic_descriptor_match.cpp samples/cpp/grabcut.cpp samples/cpp/morphology2.cpp samples/cpp/segment_objects.cpp samples/cpp/stereo_calib.cpp samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp samples/cpp/tutorial_code/introduction/display_image/display_image.cpp samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp samples/cpp/tutorial_code/objectDetection/objectDetection.cpp samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp samples/cpp/video_dmtx.cpp	2013-11-19 16:21:09 +04:00
Vadim Pisarevsky	e2bbe7597b	fixed few compile errors and doc build errors	2013-11-18 13:48:04 -05:00
Vadim Pisarevsky	d914f20a4c	updated patch to bring in the first functions with "transparent API"	2013-11-18 11:48:00 -05:00
Roman Donchenko	239704f986	Added Visual Studio 2013 detection.	2013-11-18 19:39:39 +04:00
Roman Donchenko	7973594a01	Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}. ... If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty, then the resulting path becomes absolute. Fixes <http://code.opencv.org/issues/3350>.	2013-11-18 19:21:31 +04:00
Roman Donchenko	615d6c22d1	Switched OpenCV to a 3-component version number. ... Epoch is gone; now the version component names in C++ and CMake are consistent (except REVISION corresponds to PATCH).	2013-11-15 19:41:53 +04:00
Roman Donchenko	428fb72625	Made the generated file templates' naming more consistent. ... The general convention is <output file name> + ".in".	2013-11-14 19:14:38 +04:00
Vincent Rabaud	154d119e13	do not use include_directories when calling find_package(OpenCV) ... This is something that should be left to the user, that's the whole point of OpenCV_INCLUDE_DIRS.	2013-11-14 15:24:18 +01:00
Vincent Rabaud	8e944cfe70	cleaner fix	2013-11-14 11:45:42 +01:00
Vincent Rabaud	ee7c74ceeb	return when OpenCV is found	2013-11-13 14:20:09 +01:00
Vincent Rabaud	9007a02302	fixes http://code.opencv.org/issues/3367	2013-11-13 12:25:44 +01:00
Philippe FOUBERT	8b0fc04d93	Fix the build of OpenCV with XIMEA on Windows 64 bits: ... - crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions) - the "CMAKE_CL_64" variable is not initialized when using mingw PR#1039 modified to be able to merge on branch 2.4	2013-11-10 17:46:59 +01:00
Roman Donchenko	9c83f6c4fb	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectCUDA.cmake modules/core/include/opencv2/core/version.hpp modules/cudacodec/src/ffmpeg_video_source.cpp modules/gpu/src/video_writer.cpp modules/highgui/test/test_ffmpeg.cpp modules/highgui/test/test_video_io.cpp modules/highgui/test/test_video_pos.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/arithm.cpp modules/ocl/src/blend.cpp modules/ocl/src/canny.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/filtering.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/moments.cpp modules/ocl/src/safe_call.hpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_moments.cpp samples/ocl/squares.cpp	2013-11-05 16:38:23 +04:00
Roman Donchenko	27ae6eb1f4	Merge pull request #1720 from SpecLad:cmp0017	2013-10-30 17:46:33 +04:00
Roman Donchenko	104b14e0e0	Fixed CMake warnings/bugs caused by #1670 and #1714 ... include() doesn't create a variable scope, so the settings of CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting everything included after OpenCVDetectCUDA.cmake. Also, FindCUDA includes FindPackageHandleStandardArgs, which includes CMakeParseArguments, which causes warnings related to policy CMP0017. Setting it to NEW seems safe enough.	2013-10-30 16:21:50 +04:00
Roman Donchenko	d07e7897a0	Fixed building with OpenCL, but without the ocl module. ... HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not necessary.	2013-10-30 14:07:34 +04:00
Vladislav Vinogradov	5e75a22559	fixed find package CUDA for cross-compilation ... replaced find_host_package with find_package and set CMAKE_FIND_ROOT_PATH_MODE_LIBRARY to BOTH, because NEVER doesn't work for CUDA_CUDA_LIBRARY, which is located in /usr/arm-linux-gnueabihf/lib/libcuda.so for ARM	2013-10-30 12:10:35 +04:00
Roman Donchenko	957c85e9c4	Merge pull request #1670 from jet47:cuda-cmake-fix	2013-10-29 13:24:14 +04:00
Roman Donchenko	75087580de	Merge pull request #1704 from SpecLad:merge-2.4	2013-10-29 13:13:05 +04:00
Andrey Pavlenko	616db74e49	Merge pull request #1663 from vpisarev:ocl_experiments3	2013-10-29 11:14:16 +04:00
Roman Donchenko	78be4f66f7	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/calib3d/src/calibration.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp samples/ocl/adaptive_bilateral_filter.cpp samples/ocl/bgfg_segm.cpp samples/ocl/clahe.cpp samples/ocl/facedetect.cpp samples/ocl/pyrlk_optical_flow.cpp samples/ocl/squares.cpp samples/ocl/surf_matcher.cpp samples/ocl/tvl1_optical_flow.cpp	2013-10-28 13:38:25 +04:00
Vladislav Vinogradov	06c1f9a329	added own version of FindCUDA.cmake	2013-10-28 10:09:16 +04:00
Roman Donchenko	c1223f8dac	Merge pull request #1697 from SpecLad:sdk-redux	2013-10-25 20:32:04 +04:00
Roman Donchenko	90f8906e1e	Merge pull request #1690 from SpecLad:cmake-2.8.12	2013-10-25 19:24:58 +04:00
Roman Donchenko	c016c43d25	Fixed Android SDK build - again.	2013-10-25 19:12:32 +04:00
Alexander Alekhin	7a8f9fe746	cmake: fix android installation for different NDK ABIs	2013-10-25 17:17:00 +04:00
Roman Donchenko	76b904b022	Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES. ... The reasons for that are twofold: 1) LINK_PRIVATE is only available since CMake 2.8.7. 2) The way it was used generated a warning because of CMake policy CMP0023: http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023 Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time because of CMake policy CMP0022: http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022 I set the policy to OLD, because NEW means subtle changes when compiling with CMake 2.8.12, and I don't want to research that this close to release. :-) I also removed the setting of CMP0003, because it's set by cmake_minimal_version anyway.	2013-10-25 14:19:02 +04:00
Alexander Alekhin	4b17d073c0	cmake: fix linker dependencies for opencv_java ... Linker dependencies to all OpenCV modules are invalid. We should not include other bindings in this list (like "opencv_python").	2013-10-24 19:04:59 +04:00
Vladislav Vinogradov	e5947f581a	fix CUDA 5.5 support (npp, arm cross compilation) in CMake scripts: ... The patch was submitted to CMake and might be available in the next CMake release. But until we have the fix in CMake we should add workaround in our scripts.	2013-10-24 18:17:36 +04:00
Roman Donchenko	7e1ded0ebd	Merge pull request #1664 from SpecLad:merge-2.4	2013-10-24 17:27:30 +04:00
Roman Donchenko	f0bc253d0e	Merge pull request #1667 from SpecLad:detect-openmp	2013-10-24 15:00:27 +04:00
Roman Donchenko	119cdc57e9	Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l	2013-10-24 14:18:12 +04:00
Alexander Alekhin	d571b28eaa	cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory	2013-10-23 20:28:22 +04:00
Vadim Pisarevsky	de521fc9fa	fixed some more compile bugs (including Python bindings)	2013-10-22 23:34:16 +04:00
Roman Donchenko	f82eb0f79c	Add better OpenMP detection and make an option to enable it. ... Bug report and inspiration: http://code.opencv.org/issues/3328	2013-10-22 18:47:37 +04:00
Roman Donchenko	49c6533227	Move the minimal CUDA version into the minimal version list.	2013-10-22 14:32:13 +04:00
Roman Donchenko	4036f6a3d0	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: apps/CMakeLists.txt modules/contrib/CMakeLists.txt modules/core/include/opencv2/core/version.hpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/java/generator/gen_java.py modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/columnsum.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/test/main.cpp modules/ocl/test/test_color.cpp modules/ocl/test/test_imgproc.cpp samples/gpu/CMakeLists.txt	2013-10-22 14:28:00 +04:00
Greg Hale	387587f4f0	regex doesnt need to match full length of input, so only trying to match the leading -[lL]	2013-10-21 09:27:04 -04:00
Roman Donchenko	a54d36bde8	Merge pull request #1646 from alalek:ocl_fix_msvc11	2013-10-21 16:53:24 +04:00
Roman Donchenko	bfd8acbbc3	Merge pull request #1556 from jet47:fix-bug-3296	2013-10-21 16:28:00 +04:00
Greg Hale	fe3dd762a4	fixed wrong regex	2013-10-19 17:30:32 -04:00
Alexander Alekhin	cfc3b9abbb	ocl: workaround for msvc11 bug ... "#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found) See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file So replace them to #pragma message.	2013-10-18 20:52:36 +04:00
Andrey Pavlenko	d50f0d2ed2	Merge pull request #1587 from alalek:opencl_khronos_headers	2013-10-18 18:41:13 +04:00
Alexander Alekhin	6344da9ac3	ocl: force to use Khronos OpenCL headers	2013-10-18 15:47:11 +04:00
Alexander Alekhin	83b7fbe376	cmake: cleanup OpenCVModules_TARGETS from cache ... This will allow to disable modules between cmake runs	2013-10-17 23:43:33 +04:00
Greg Hale	0c4d484679	added backslash	2013-10-17 14:17:49 -04:00
Greg Hale	61ccd170bd	shortened code to not repeat myself	2013-10-17 14:12:02 -04:00
Greg Hale	5bd5993663	Only append -l to lib entries with no path and no -l or -L of their own	2013-10-17 14:05:06 -04:00
Alexander Alekhin	9941d3f71a	cmake: restore find_package() for build directory	2013-10-15 23:05:40 +04:00
Greg Hale	70df365c87	changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list	2013-10-15 14:54:58 -04:00
Alexander Alekhin	e845184843	Merge remote-tracking branch 'upstream/2.4' into merge-2.4 ... * #1538 from StevenPuttemans:bugfix_3283 * #1545 from alalek:ocl_test_fix_rng * #1551 from alalek:cmake_install_win * #1570 from ilya-lavrenov:ipp_warn_fix * #1573 from alalek:perf_simple_strategy * #1574 from alalek:svm_workaround * #1576 from alalek:ocl_fix_cl_double * #1577 from ilya-lavrenov:ocl_setto_opencl12 * #1578 from asmorkalov:android_fd_cp_fix * #1579 from ilya-lavrenov:ocl_norm * #1582 from sperrholz:ocl-arithm-additions * #1586 from ilya-lavrenov:ocl_setto_win_fix * #1589 from ilya-lavrenov:pr1582_fix * #1591 from alalek:ocl_remove_cl_hpp_h * #1592 from alalek:ocl_program_cache_update * #1593 from ilya-lavrenov:ocl_war_on_double * #1594 from ilya-lavrenov:ocl_perf * #1595 from alalek:cl_code_cleanup * #1596 from alalek:test_fix_run_py * #1597 from alalek:ocl_fix_cleanup * #1598 from alalek:ocl_fix_build_mac * #1599 from ilya-lavrenov:ocl_mac_kernel_warnings * #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse * #1602 from alalek:ocl_test_dump_info * #1603 from ilya-lavrenov:ocl_disable_svm_noblas * #1605 from alalek:ocl_fixes * #1606 from ilya-lavrenov:ocl_imgproc * #1607 from ilya-lavrenov:ocl_fft_cleanup * #1608 from alalek:fix_warn_upd_haar * #1609 from ilya-lavrenov:ocl_some_optimization * #1610 from alalek:ocl_fix_perf_kalman * #1612 from alalek:ocl_fix_string_info * #1614 from ilya-lavrenov:ocl_svm_misprint * #1616 from ilya-lavrenov:ocl_cvtColor * #1617 from ilya-lavrenov:ocl_info * #1622 from a0byte:2.4 * #1625 from ilya-lavrenov:to_string Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVDetectPython.cmake cmake/OpenCVGenConfig.cmake modules/core/CMakeLists.txt modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/perf/main.cpp modules/ocl/src/arithm.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/color.cpp modules/ocl/src/fft.cpp modules/ocl/src/filtering.cpp modules/ocl/src/gemm.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/split_merge.cpp modules/ocl/src/svm.cpp modules/ocl/test/main.cpp modules/ocl/test/test_fft.cpp modules/ocl/test/test_moments.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/test_optflow.cpp modules/ocl/test/utility.hpp modules/python/CMakeLists.txt modules/ts/include/opencv2/ts.hpp modules/ts/src/ts_perf.cpp samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp	2013-10-15 20:08:52 +04:00
Greg Hale	f23b51de6f	Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file	2013-10-14 13:36:07 -04:00
Andrey Pavlenko	3b1c53fa8d	Merge pull request #1551 from alalek:cmake_install_win	2013-10-10 18:20:35 +04:00
Alexander Alekhin	d26f62569d	ocl: fix compilation warnings, update openCLExecuteKernelInterop	2013-10-10 00:15:02 +04:00
Alexander Alekhin	fbe7448250	cmake: export OpenCVModules for unix 'install', move macros desclarations	2013-10-09 18:29:03 +04:00
Alexander Alekhin	4adede4246	cmake: python module updates	2013-10-09 17:49:11 +04:00
Alexander Alekhin	47dd44e490	cmake: OpenCVConfig.cmake: fix message	2013-10-09 17:49:11 +04:00
Alexander Alekhin	034a77c26d	cmake: workaround for dependencies resolver (bypass non-module deps w/o check)	2013-10-09 17:49:10 +04:00
Alexander Alekhin	555c505b70	update cmake 'install' target for Windows platform ... Allow to build samples via OpenCV binaries from distribution package (find_package with OpenCV_DIR).	2013-10-09 17:49:10 +04:00
Roman Donchenko	f07769e9d8	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectOpenCL.cmake cmake/OpenCVModule.cmake modules/imgproc/src/floodfill.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/perf/main.cpp modules/ocl/src/arithm.cpp modules/ocl/src/blend.cpp modules/ocl/src/build_warps.cpp modules/ocl/src/canny.cpp modules/ocl/src/cl_programcache.hpp modules/ocl/src/columnsum.cpp modules/ocl/src/haar.cpp modules/ocl/src/hog.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/initialization.cpp modules/ocl/src/match_template.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/mcwutil.cpp modules/ocl/src/moments.cpp modules/ocl/src/mssegmentation.cpp modules/ocl/src/precomp.hpp modules/ocl/src/pyrdown.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/pyrup.cpp modules/ocl/src/split_merge.cpp modules/ocl/src/stereo_csbp.cpp modules/ocl/src/stereobm.cpp modules/ocl/test/main.cpp samples/ocl/bgfg_segm.cpp samples/ocl/facedetect.cpp samples/ocl/pyrlk_optical_flow.cpp samples/ocl/squares.cpp samples/ocl/stereo_match.cpp samples/ocl/surf_matcher.cpp samples/ocl/tvl1_optical_flow.cpp	2013-10-08 17:57:23 +04:00
Tony	c1cd70e25a	Disable OpenGL when Gtk3 is selected ... The OpenGL library is not supported on Gtk3 which uses the cairo library for rendering. Cairo, in turn uses hardware acceleration when supported by the underlying system. Some improvement to performance may be gained by useing the cairo-gl and cairo-glx libraries included on modern Gtk3 systems. See the cairo documentation for further information. The following link may also be of interest. http://lists.cairographics.org/archives/cairo/2012-October/023609.html	2013-10-04 23:09:45 +01:00
Roman Donchenko	df213241cc	Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix	2013-10-04 18:15:05 +04:00
Vladislav Vinogradov	adc516becc	fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit	2013-10-04 15:14:21 +04:00
Alexander Alekhin	dd9ff587dc	ocl: file-based ProgramCache refactoring	2013-10-03 19:50:14 +04:00
Alexander Alekhin	b00f79ac5f	ocl: move program names into opencl_kernels.hpp	2013-10-03 19:50:14 +04:00
Vladislav Vinogradov	4e4d2da0b9	fix #3296 : Unsupported gpu architecture 'compute_21'	2013-10-03 10:21:00 +04:00
Tony	81d6842b8e	These changes introduce Gtk3 support into the highgui module. ... A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected). window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3. To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.	2013-10-02 21:16:40 +01:00
Alexander Alekhin	212ad97100	ocl: dynamic load of OpenCL libraries ... Support functions from OpenCL 1.1 / OpenCL 1.2	2013-10-02 18:32:33 +04:00
Roman Donchenko	30d7e1c33d	Merge remote-tracking branch 'origin/master' into merge-2.4 ... Conflicts: doc/tutorials/bioinspired/retina_model/retina_model.rst~	2013-10-02 13:37:33 +04:00
Roman Donchenko	a71a891b93	Merge pull request #1451 from adrians:neon-pull2	2013-10-02 12:51:30 +04:00
Roman Donchenko	81eb4bd8be	Merge remote-tracking branch 'origin/2.4' ... Conflicts: doc/tutorials/features2d/feature_detection/feature_detection.rst modules/bioinspired/doc/retina/index.rst modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/mat.hpp modules/core/include/opencv2/core/operations.hpp modules/core/src/stat.cpp modules/features2d/include/opencv2/features2d/features2d.hpp modules/imgproc/src/filter.cpp modules/legacy/src/dpstereo.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/doc/image_processing.rst modules/ocl/doc/object_detection.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/arithm.cpp modules/ocl/src/canny.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/initialization.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/pyrdown.cpp modules/ocl/src/pyrup.cpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/utility.hpp	2013-10-01 15:57:33 +04:00
Alexander Smorkalov	308fbeb04b	Make libv4l support optional for testing purposes.	2013-09-30 12:44:59 +04:00
Alexander Alekhin	b4a534a235	cmake: PCH: use DEFINE_SYMBOL target property	2013-09-25 12:27:08 +04:00
Alexander Alekhin	48774a39b4	cmake: fixed incorrect usage of add_definitions() on Linux	2013-09-25 12:27:08 +04:00
Alexander Alekhin	ce557fb7be	Revert "cmake: fixed incorrect usage of add_definitions() on Linux" ... This reverts commit 286244efed.	2013-09-24 15:12:24 +04:00
Alexander Smorkalov	298a1d50d2	Merge pull request #1299 from jet47:gpu-cuda-rename	2013-09-23 10:31:51 +04:00
Alexander Alekhin	286244efed	cmake: fixed incorrect usage of add_definitions() on Linux	2013-09-21 21:12:39 +04:00
Alexander Smorkalov	c550e452f9	Merge pull request #1384 from hbristow:matlab_public	2013-09-19 10:25:02 +04:00
hbristow	eb3a83209c	Added TODO for the future of Matlab version sorting	2013-09-16 00:48:07 +10:00
hbristow	31c58d23e0	Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process	2013-09-15 23:53:29 +10:00
hbristow	86b7e3d15d	Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)	2013-09-15 17:36:13 +10:00
Adrian Stratulat	f9ea3772b0	Add compile option for enabling NEON	2013-09-14 13:32:20 +03:00
hbristow	224f44a255	Made changes to OpenCVFindMatlab suggested by SpecLad	2013-09-14 13:32:15 +10:00
Roman Donchenko	671e5e39b1	Dropped the HAVE_DC1394_095 configuration macro. ... We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out in 2004. Note that 1.0 doesn't have the do_extra_buffering parameter.	2013-09-13 17:25:21 +04:00
Roman Donchenko	160ab8415e	Merge pull request #1330 from lenlen:plantuml	2013-09-13 14:31:01 +04:00
hbristow	232f11e256	Updated OpenCVFindMatlab with changes suggested by SpecLad	2013-09-13 18:08:33 +10:00
Roman Donchenko	473bfb0019	Updated the build config files to deal with the version status. ... I didn't make the status part of the version variables here, because letters don't play too well with version comparison algorithms (especially with CMake's, which only supports numbers).	2013-09-12 16:37:30 +04:00
Roman Donchenko	cd8ff69637	Added version status support into the build system.	2013-09-12 16:37:05 +04:00
antonella	5b2d557502	Added plantuml extension ... Aligned strings in CMakeList Modified the check on plantuml extension Some fixes Moved find_host_program for plantuml script	2013-09-12 10:41:21 +00:00
Vladislav Vinogradov	6bbac2a7d9	Merge branch 'master' into gpu-cuda-rename	2013-09-11 09:41:23 +04:00
Roman Donchenko	242e4254f3	Merge pull request #1427 from SpecLad:merge-2.4	2013-09-10 18:28:20 +04:00
Roman Donchenko	95c2e8b51f	Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: .gitignore doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst modules/gpu/src/match_template.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_precomp.hpp	2013-09-10 11:30:19 +04:00