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

..

checks

ocl: workaround for msvc11 bug

2013-10-18 20:52:36 +04:00

templates

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

cl2cpp.cmake

ocl: fix compilation warnings, update openCLExecuteKernelInterop

2013-10-10 00:15:02 +04:00

OpenCVCompilerOptions.cmake

Add compile option for enabling NEON

2013-09-14 13:32:20 +03:00

OpenCVConfig.cmake

cmake: export OpenCVModules for unix 'install', move macros desclarations

2013-10-09 18:29:03 +04:00

OpenCVCRTLinkage.cmake

/apicontainer added to linker flags on WinRT to fix api test issues.

2013-08-28 08:36:57 -07:00

OpenCVDetectAndroidSDK.cmake

Reenabled adding native app glue for Android samples.

2013-09-09 18:16:20 +04:00

OpenCVDetectApacheAnt.cmake

Fix ant/Java detection in cmake scripts

2013-03-29 18:29:40 +04:00

OpenCVDetectCStripes.cmake

fixed C= detection script

2012-10-10 16:15:27 +04:00

OpenCVDetectCUDA.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00

OpenCVDetectCXXCompiler.cmake

update cmake 'install' target for Windows platform

2013-10-09 17:49:10 +04:00

OpenCVDetectOpenCL.cmake

ocl: force to use Khronos OpenCL headers

2013-10-18 15:47:11 +04:00

OpenCVDetectPython.cmake

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

2013-02-06 14:43:57 +04:00

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

2013-03-25 21:57:53 +04:00

OpenCVFindIPP.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVFindLATEX.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindLibsGrfmt.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-27 19:15:47 +04:00

OpenCVFindLibsGUI.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-27 19:15:47 +04:00

OpenCVFindLibsPerf.cmake

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

OpenCVFindLibsVideo.cmake

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-08 17:57:23 +04:00

OpenCVFindMatlab.cmake

Added TODO for the future of Matlab version sorting

2013-09-16 00:48:07 +10:00

OpenCVFindOpenEXR.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindOpenNI.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindWebP.cmake

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

OpenCVFindXimea.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVGenAndroidMK.cmake

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

2013-02-22 11:57:42 +04:00

OpenCVGenConfig.cmake

cmake: restore find_package() for build directory

2013-10-15 23:05:40 +04:00

OpenCVGenHeaders.cmake

Removed unused PACKAGE_* macros.

2013-07-11 14:30:46 +04:00

OpenCVGenInfoPlist.cmake

Fix building the iOS framework after I dropped the VERSION macro.

2013-08-06 18:56:36 +04:00

OpenCVGenPkgconfig.cmake

Removed useless VERSION macro (and CMake variable)

2013-07-11 14:30:46 +04:00

OpenCVMinDepVersions.cmake

Bumped minimal Python version to 2.6.

2013-08-23 18:46:54 +04:00

OpenCVModule.cmake

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

OpenCVPCHSupport.cmake

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

OpenCVUtils.cmake

cmake: cleanup OpenCVModules_TARGETS from cache

2013-10-17 23:43:33 +04:00

OpenCVVersion.cmake

Added version status support into the build system.

2013-09-12 16:37:05 +04:00