Commit 990ec83f authored by Bob Obara's avatar Bob Obara Committed by Kitware Robot

Merge topic 'fix_opencv_on_xcode_8'

90227940 update opencv and remove the contrib since it is not being used
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Bob Obara's avatarBob Obara <bob.obara@kitware.com>
Merge-request: !198
parents 7d4c8a0a 90227940
......@@ -33,7 +33,6 @@ function (superbuild_find_projects var)
numpy
oce
opencv
opencvcontrib
paraview
png
python
......
superbuild_add_project(opencv
DEPENDS
python qt4 opencvcontrib numpy
python qt4 numpy
CMAKE_ARGS
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/modules
-DBUILD_PERF_TESTS:BOOL=OFF
-DBUILD_TESTS:BOOL=OFF
-DBUILD_opencv_flann:BOOL=OFF
......
......@@ -40,14 +40,8 @@ superbuild_set_revision(vxl
superbuild_set_revision(opencv
# https://github.com/opencv/opencv.git
# master as of Aug 11 2016
URL "http://www.paraview.org/files/dependencies/opencv-74e997f15b20600895896e1a837a0bb3cbf7f07b.tar.bz2"
URL_MD5 b33767f505bb0e67ffb25d33f5301fa1)
superbuild_set_revision(opencvcontrib
# https://github.com/opencv/opencv_contrib.git
# master as of Aug 11 2016
URL "http://www.paraview.org/files/dependencies/opencv-contrib-73459049a323af2c88e89037b45fadb7085020fb.tar.bz2"
URL_MD5 ce88b2b192bc4018ef39cbafcc8d77b3)
URL "http://www.computationalmodelbuilder.org/files/dependencies/opencv-dd379ec9fddc1a1886766cf85844a6e18d38c4f1.tar.bz2"
URL_MD5 19bbd14ed1bd741beccd6d19e444552f)
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
......
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