Commit 0f0deed7 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'minor-fixes'

01f0e214 opencv: disable unnecessary bits
509852aa cpack: bumpt test timeouts up to 100 minutes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Jacob Becker's avatarJacob Becker <jacob.becker@kitware.com>
Merge-request: !185
parents cca547ef 01f0e214
......@@ -105,10 +105,10 @@ function (superbuild_add_packaging)
foreach (generator IN LISTS generators)
superbuild_add_extra_package_test(modelbuilder "${generator}"
LABELS "CMB"
TIMEOUT 1200)
TIMEOUT 6400)
superbuild_add_extra_package_test(hydrology "${generator}"
LABELS "CMB"
TIMEOUT 1200)
TIMEOUT 6400)
endforeach ()
endfunction ()
......
......@@ -3,9 +3,14 @@ superbuild_add_project(opencv
python qt4 opencvcontrib 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
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_GTK:BOOL=OFF
-DWITH_FFMPEG:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DOpenCV_INSTALL_BINARIES_PREFIX:STRING=
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
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