opencv/cmake at cc054937303dd90915569e9864f8618de9be51c3 - opencv - Atria-soft GIT

generic-library/opencv

History

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

..

cmake: detect Direct 3D 11

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

added own version of FindCUDA.cmake

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

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

2014-03-24 19:02:16 +04:00

cl2cpp.cmake

renamed **2 -> **

2014-02-04 19:55:11 +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

2014-02-25 15:02:24 +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

Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.

2014-03-19 18:47:32 +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

2014-03-24 19:02:16 +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

More proper OpneCv+Qt+Vtk issues handling (http://code.opencv.org/issues/3492 )

2014-02-10 15:45:44 +04:00

OpenCVExtraTargets.cmake

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +04:00

OpenCVFindIntelPerCSDK.cmake

Fix notes about cmake files. Fix build warning.

2013-12-17 16:13:55 +04:00

OpenCVFindIPP.cmake

Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.

2014-02-17 16:56:02 +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

Libraries filter update after abs path cut.

2014-03-21 12:48:38 +04:00

OpenCVGenConfig.cmake

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +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

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +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-03-24 19:02:16 +04:00

OpenCVPackaging.cmake

Multiple fixes for tests deb package build.

2014-01-28 16:32:26 +04:00

OpenCVPCHSupport.cmake

Merge remote-tracking branch 'origin/2.4'

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

OpenCVUtils.cmake

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

2014-02-11 12:05:01 +04:00

OpenCVVersion.cmake

Switched OpenCV to a 3-component version number.

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