Merge branch 'master' into GammaIndex3D

[clitk.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 47b7f33f112efd576b191435f6cf291d2606742d..43121daaaa0db0ed2a643632919ceff961416c2c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,12 @@ env:
     - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7
     - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=5.5.1
     - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=4.8.7
-    - WITH_CMAKE=true VTK_VERSION=6.0 ITK_VERSION=4.5 QT_VERSION=4.8.7
+    - WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7
 
 matrix:
   exclude:
   - os: osx
-    env: WITH_CMAKE=true VTK_VERSION=6.0 ITK_VERSION=4.5 QT_VERSION=4.8.7 #VTK6.0 doesn't work with osX
+    env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7 #VTK6.0 doesn't work with osX
 
 language: cpp
 
@@ -52,14 +52,15 @@ install:
 - if test $TRAVIS_OS_NAME == linux; then sudo apt-get -y install libgdcm2-dev libpq-dev; fi
 - if test $TRAVIS_OS_NAME == linux; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then QTDIR="/opt/qt55" && PATH="$PATH:$QTDIR/bin" && qt55-env.sh ; fi; fi
 - if test $TRAVIS_OS_NAME == osx ; then export HOMEBREW_QT_VERSION=$(brew list --versions qt | rev | cut -d' ' -f1 | rev); fi
-- if test $TRAVIS_OS_NAME == osx ; then ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT_VERSION/mkspecs /usr/local/mkspecs; fi
-- if test $TRAVIS_OS_NAME == osx ; then ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT_VERSION/plugins /usr/local/plugins; fi
+- if test $TRAVIS_OS_NAME == osx ; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then ln -s /usr/local/Cellar/qt@5.5/5.5.1/mkspecs /usr/local/mkspecs; fi; fi
+- if test $TRAVIS_OS_NAME == osx ; then if [[ "$QT_VERSION" == "5.5.1" ]] ; then ln -s /usr/local/Cellar/qt@5.5/5.5.1/plugins /usr/local/plugins; fi; fi
 - if test $TRAVIS_OS_NAME == osx ; then qmake -v; fi
 
 cache:
+ - timeout: 1000
  - directories:
-   - $HOME/vtk-6.0
-   - $HOME/vtk-6.0-build
+   - $HOME/vtk-5.10
+   - $HOME/vtk-5.10-build
    - $HOME/vtk-6.3
    - $HOME/vtk-6.3-build
    - $HOME/vtk-7.0.0
@@ -72,9 +73,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
+- $SCRIPTS/travis_build_vv.sh