third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
aacf188e83
opencv/cmake
History
Roman Donchenko aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +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-19 16:21:09 +04:00
cl2cpp.cmake ocl: fix compilation warnings, update openCLExecuteKernelInterop 2013-10-10 00:15:02 +04:00
FindCUDA.cmake added own version of FindCUDA.cmake 2013-10-28 10:09:16 +04:00
OpenCVCompilerOptions.cmake Add compile option for enabling NEON 2013-09-14 13:32:20 +03:00
OpenCVConfig.cmake cmake: export OpenCVModules for unix 'install', move macros desclarations 2013-10-09 18:29:03 +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
OpenCVDetectCUDA.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
OpenCVDetectCXXCompiler.cmake update cmake 'install' target for Windows platform 2013-10-09 17:49:10 +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
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
OpenCVFindOpenNI.cmake
OpenCVFindWebP.cmake This code is based on https://github.com/prasannatsm/opencv code. 2013-03-11 11:51:38 +04:00
OpenCVFindXimea.cmake Normalized file endings. 2013-08-21 18:59:25 +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 Fixed Android SDK build - again. 2013-10-25 19:12:32 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +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 Added version status support into the build system. 2013-09-12 16:37:05 +04:00