Commit c5b6eab4 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'opencv-video-io'

5154418b opencv: update comment for the commit being used
6653bf99 opencvcontrib: remove unused file
ad517146 opencv: disable the videoio module
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !201
parents 990ec83f 5154418b
......@@ -7,6 +7,7 @@ superbuild_add_project(opencv
-DBUILD_opencv_flann:BOOL=OFF
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DBUILD_opencv_videoio:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_GTK:BOOL=OFF
-DWITH_FFMPEG:BOOL=OFF
......
superbuild_add_project(opencvcontrib
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
"")
......@@ -37,9 +37,9 @@ superbuild_set_revision(vxl
URL "http://www.paraview.org/files/dependencies/vxl-44433e4bd8ca3eabe4e5441444bf2a050d689d45.tar.bz2"
URL_MD5 dfff6d1958334cbbadb4edbf8c3f4cb6)
# Use opencv from Thu Oct 6 13:40:33 2016 +0000
superbuild_set_revision(opencv
# https://github.com/opencv/opencv.git
# master as of Aug 11 2016
URL "http://www.computationalmodelbuilder.org/files/dependencies/opencv-dd379ec9fddc1a1886766cf85844a6e18d38c4f1.tar.bz2"
URL_MD5 19bbd14ed1bd741beccd6d19e444552f)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment