mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3ee12cbeb4
opencv/cmake
History
Roman Donchenko 3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +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 fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one) 2013-04-29 23:10:03 +04:00
OpenCVDetectPython.cmake Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +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 Make highgui.hpp independent from C API 2013-04-08 15:47:29 +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 Normalize line endings and whitespace 2012-10-17 15:57:49 +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' into merge-2.4 2013-06-10 18:18:01 +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 Don't resolve symlinks when looking for modules. 2013-06-05 17:17:13 +04:00
OpenCVVersion.cmake Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00