mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
926cab2baa
opencv/cmake
History
Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
2013-12-03 17:35:21 +04:00
..
checks ocl: workaround for msvc11 bug 2013-10-18 20:52:36 +04:00
FindCUDA added own version of FindCUDA.cmake 2013-10-28 10:09:16 +04:00
templates Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
cl2cpp.cmake fixed few compile errors and doc build errors 2013-11-18 13:48:04 -05: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-03 17:35:21 +04:00
OpenCVConfig.cmake Added Visual Studio 2013 detection. 2013-11-18 19:39:39 +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-12-03 17:35:21 +04:00
OpenCVDetectCXXCompiler.cmake Added Visual Studio 2013 detection. 2013-11-18 19:39:39 +04:00
OpenCVDetectOpenCL.cmake ocl: force to use Khronos OpenCL headers 2013-10-18 15:47:11 +04:00
OpenCVDetectPython.cmake fixed some more compile bugs (including Python bindings) 2013-10-22 23:34:16 +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 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-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 Fix the build of OpenCV with XIMEA on Windows 64 bits: 2013-11-10 17:46:59 +01: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 Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}. 2013-11-18 19:21:31 +04:00
OpenCVGenHeaders.cmake Made the generated file templates' naming more consistent. 2013-11-14 19:14:38 +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 Made the generated file templates' naming more consistent. 2013-11-14 19:14:38 +04:00
OpenCVMinDepVersions.cmake Move the minimal CUDA version into the minimal version list. 2013-10-22 14:32:13 +04:00
OpenCVModule.cmake ocl/core: added prototype for tests 2013-11-22 18:37:44 +04:00
OpenCVPCHSupport.cmake Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
OpenCVUtils.cmake cmake: fix linker dependencies for opencv_java 2013-10-24 19:04:59 +04:00
OpenCVVersion.cmake Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00