X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=.travis.yml;h=87fbf28f1ba9a4b523d112327a73b4076dd628f4;hb=5789cfb7804e57f70589f146de2f34c2becafc67;hp=0d8bcc773427850c80d116114e27f622067c401f;hpb=182111af268e441aeed063d9ee76c7586ebf3f4c;p=clitk.git

diff --git a/.travis.yml b/.travis.yml
index 0d8bcc7..87fbf28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,11 +52,12 @@ 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_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_1/plugins /usr/local/plugins; fi; fi
 - if test $TRAVIS_OS_NAME == osx ; then qmake -v; fi
 
 cache:
+ - timeout: 1000
  - directories:
    - $HOME/vtk-5.10
    - $HOME/vtk-5.10-build
@@ -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