Merge branch 'master' into wipe

diff --git a/.travis.yml b/.travis.yml
index ce53271188e155e2f65bb4bee940d52ce61e7271..0d8bcc773427850c80d116114e27f622067c401f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,9 +72,9 @@ cache:
 before_script:
 - if test $TRAVIS_OS_NAME == linux ; then sudo ln -s /usr/bin/x86_64-linux-gnu/libpq.so /usr/bin/libpq.so; fi
 - $SCRIPTS/travis_build_vtk.sh
-- $SCRIPTS/travis_build_itk.sh
+#- $SCRIPTS/travis_build_itk.sh
 #Install vtk and itk (different version)
 
 script:
-#- echo "coucou";
-- $SCRIPTS/travis_build_vv.sh
+- echo "coucou";
+#- $SCRIPTS/travis_build_vv.sh

diff --git a/travis/travis_build_vtk.sh b/travis/travis_build_vtk.sh
index 5b7e7e873a5128431ab0e56119b3097769ad6106..f7b1fce56d102385b1cdf1bd1f29695f4c074d02 100755 (executable)
--- a/travis/travis_build_vtk.sh
+++ b/travis/travis_build_vtk.sh
@@ -17,18 +17,9 @@ cmake_arg_str=" $cmake_arg_str
   -DBUILD_TESTING=0
   -DBUILD_EXAMPLES=0
   -DBUILD_DOCUMENTATION=0
-  -DVTK_Group_StandAlone=ON
-  -DVTK_Group_Imaging=OFF
-  -DVTK_Group_MPI=OFF
-  -DVTK_Group_Rendering=ON
-  -DVTK_Group_Tk=OFF
-  -DVTK_Group_Views=OFF
-  -DVTK_Group_Web=OFF
-  -DModule_vtkGUISupportQt=ON
-  -DModule_vtkGUISupportQtOpenGL=ON
-  -DModule_vtkGUISupportQtSQL=ON
-  -DModule_vtkRenderingQt=ON
-  -DModule_vtkViewsQt=ON
+  -DVTK_USE_QT=ON
+  -DVTK_USE_RENDERING=ON
+  -DVTK_USE_VIEWS=ON
   -DVTK_QT_VERSION="$QT_MAJOR_VERSION" "
 elif [ "$VTK_VERSION" == "6.3" ]; then
 vtk_repo_str=" --branch v6.3.0 https://github.com/Kitware/VTK.git --depth 1"

diff --git a/travis/travis_build_vv.sh b/travis/travis_build_vv.sh
index c3c9a0abb742793113d07a419c8350e677058262..797b03cc7077d6568d342fafbf8b0f6dcd46d049 100755 (executable)
--- a/travis/travis_build_vv.sh
+++ b/travis/travis_build_vv.sh
@@ -5,7 +5,7 @@ MAKE="make --jobs=$NUM_THREADS --keep-going"
 #Prepare cmake arguments following the vv version
 cmake_arg_str=" -DCLITK_BUILD_REGISTRATION=OFF
 -DCLITK_BUILD_SEGMENTATION=OFF
--DCLITK_BUILD_TOOLS=ON
+-DCLITK_BUILD_TOOLS=OFF
 -DCLITK_BUILD_VV=ON
 -DCLITK_EXPERIMENTAL=OFF"