opencv/cmake
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4'
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
..
checks Merge branch '2.4' 2013-04-05 21:11:59 +04:00
templates Merge branch '2.4' 2013-04-05 21:11:59 +04:00
cl2cpp.cmake discard comments in kernels.cpp 2013-03-26 12:01:01 +08:00
CMakeParseArguments.cmake minor fix in FindTBB 2012-08-23 13:37:27 +04:00
OpenCVCompilerOptions.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
OpenCVConfig.cmake Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
OpenCVCRTLinkage.cmake Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration 2012-03-02 14:48:35 +00:00
OpenCVDetectAndroidSDK.cmake Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +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 fixed compiler warning 2013-06-07 13:34:33 +04:00
OpenCVDetectCXXCompiler.cmake Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
OpenCVDetectOpenCL.cmake fix for bug #2985: 2013-06-13 16:13:46 +04:00
OpenCVDetectPython.cmake Updated cmake files to use print(). 2013-06-13 20:10:01 -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 fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!) 2012-10-08 22:00: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 branch '2.4' 2013-04-05 21:11:59 +04:00
OpenCVFindLibsGUI.cmake Fix a missing header path when building with Qt 4. 2013-06-06 14:09:33 +04:00
OpenCVFindLibsPerf.cmake Merge branch '2.4' 2013-04-05 21:11:59 +04:00
OpenCVFindLibsVideo.cmake Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04: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
OpenCVFindPkgConfig.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
OpenCVFindWebP.cmake This code is based on https://github.com/prasannatsm/opencv code. 2013-03-11 11:51:38 +04:00
OpenCVFindXimea.cmake Fixed Ximea cameras support 2013-06-11 21:17:31 +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 android -> plarforms/android 2013-05-27 11:10:38 +04:00
OpenCVGenHeaders.cmake Fixed linux and android install 2012-06-27 13:52:29 +00:00
OpenCVGenPkgconfig.cmake Fixed linux and android install 2012-06-27 13:52:29 +00:00
OpenCVLegacyOptions.cmake Code review notes fixed. 2013-04-03 04:14:40 -07:00
OpenCVModule.cmake Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
OpenCVPCHSupport.cmake Compile opencv_test_core with cv::String instead of std::string 2013-03-22 22:14:22 +04:00
OpenCVUtils.cmake Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
OpenCVVersion.cmake Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00