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

..

checks

cmake: detect Direct 3D 11

2013-12-13 15:57:31 +04:00

FindCUDA

added own version of FindCUDA.cmake

2013-10-28 10:09:16 +04:00

templates

Fake dependency from CUDA in case of satic linkage with OpenCV removed.

2013-12-26 13:07:53 +04:00

cl2cpp.cmake

added new macros useful for tracking whether OpenCL impl run or not

2014-01-24 17:16:40 +04:00

FindCUDA.cmake

fixed CUDA_TOOLKIT_TARGET_DIR for android:

2013-11-28 13:35:23 +04:00

OpenCVCompilerOptions.cmake

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

2013-12-23 18:50:17 +04:00

OpenCVConfig.cmake

Added Visual Studio 2013 detection.

2013-11-18 19:39:39 +04:00

OpenCVCRTLinkage.cmake

Update CMakeLists.txt

2013-12-26 19:45:21 +08:00

OpenCVDetectAndroidSDK.cmake

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

2014-01-27 15:28:14 +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-12-03 17:35:21 +04:00

OpenCVDetectCXXCompiler.cmake

Added Visual Studio 2013 detection.

2013-11-18 19:39:39 +04:00

OpenCVDetectDirectX.cmake

cmake: detect Direct 3D 11

2013-12-13 15:57:31 +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 'origin/2.4' into merge-2.4

2014-01-27 15:28:14 +04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

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

OpenCVDetectVTK.cmake

updated for compatibility with VTK6.0

2014-01-19 18:38:58 +04:00

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

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

OpenCVFindIntelPerCSDK.cmake

Fix notes about cmake files. Fix build warning.

2013-12-17 16:13:55 +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

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

2013-10-28 13:38:25 +04:00

OpenCVFindLibsVideo.cmake

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

2013-12-23 18:50:17 +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

Fix the build of OpenCV with XIMEA on Windows 64 bits:

2013-11-10 17:46:59 +01:00

OpenCVGenAndroidMK.cmake

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

2014-01-27 15:28:14 +04:00

OpenCVGenConfig.cmake

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +04:00

OpenCVGenHeaders.cmake

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +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

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +04:00

OpenCVMinDepVersions.cmake

Move the minimal CUDA version into the minimal version list.

2013-10-22 14:32:13 +04:00

OpenCVModule.cmake

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

2014-01-27 15:28:14 +04:00

OpenCVPackaging.cmake

Improvements in package build.

2014-01-24 12:00:44 +04:00

OpenCVPCHSupport.cmake

Merge remote-tracking branch 'origin/2.4'

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

OpenCVUtils.cmake

cmake: allow source_group to preserve file-system tree (for MSVS)

2013-12-07 14:38:59 +04:00

OpenCVVersion.cmake

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00