Skip to content

O
opencv
Switch branch/tag
History Find file
  • Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 48432502
    Roman Donchenko authored 
    Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
    48432502
Name
Last commit
 Last update
..
FindCUDA added own version of FindCUDA.cmake
checks cmake: detect Direct 3D 11
templates Merge remote-tracking branch 'origin/2.4' into merge-2.4
FindCUDA.cmake fixed CUDA_TOOLKIT_TARGET_DIR for android:
OpenCVCRTLinkage.cmake Update CMakeLists.txt
OpenCVCompilerOptions.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVConfig.cmake Added Visual Studio 2013 detection.
OpenCVDetectAndroidSDK.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVDetectApacheAnt.cmake Fix ant/Java detection in cmake scripts
OpenCVDetectCStripes.cmake fixed C= detection script
OpenCVDetectCUDA.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVDetectCXXCompiler.cmake Added Visual Studio 2013 detection.
OpenCVDetectDirectX.cmake cmake: detect Direct 3D 11
OpenCVDetectOpenCL.cmake ocl: force to use Khronos OpenCL headers
OpenCVDetectPython.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVDetectTBB.cmake TBB download and build option enabled for non Android platfroms.
OpenCVDetectVTK.cmake added guard against linking qt5 and VTK together
OpenCVExtraTargets.cmake Removed all use of the obsolete IMMEDIATE parameter to configure_file.
OpenCVFindIPP.cmake Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
OpenCVFindIntelPerCSDK.cmake Fix notes about cmake files. Fix build warning.
OpenCVFindLATEX.cmake Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
OpenCVFindLibsGUI.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVFindLibsGrfmt.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVFindLibsPerf.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVFindLibsVideo.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVFindMatlab.cmake Added TODO for the future of Matlab version sorting
OpenCVFindOpenEXR.cmake Normalize line endings and whitespace
OpenCVFindOpenNI.cmake Normalize line endings and whitespace
OpenCVFindWebP.cmake This code is based on https://github.com/prasannatsm/opencv code.
OpenCVFindXimea.cmake Fix the build of OpenCV with XIMEA on Windows 64 bits:
OpenCVGenAndroidMK.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVGenConfig.cmake Removed all use of the obsolete IMMEDIATE parameter to configure_file.
OpenCVGenHeaders.cmake All installed files marked with component names for install customization.
OpenCVGenInfoPlist.cmake Fix building the iOS framework after I dropped the VERSION macro.
OpenCVGenPkgconfig.cmake Removed all use of the obsolete IMMEDIATE parameter to configure_file.
OpenCVMinDepVersions.cmake Move the minimal CUDA version into the minimal version list.
OpenCVModule.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVPCHSupport.cmake Merge remote-tracking branch 'origin/2.4'
OpenCVPackaging.cmake Multiple fixes for tests deb package build.
OpenCVUtils.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVVersion.cmake Switched OpenCV to a 3-component version number.
cl2cpp.cmake renamed **2 -> **