Update README with installation instructions

[clitk.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9cc6b8aacf09fcbccb598059eb9e14b94ce37146..028ccb8063448a9812256f031d75d54697a08f56 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,8 +65,6 @@ before_install:
 - export ITK_SOURCE_DIR=${EXTERNALS_DIR}/itk-${ITK_VERSION}
 - export ITK_DIR=${EXTERNALS_DIR}/itk-${ITK_VERSION}-build
 - export BUILD_DIR=$cwd/build
-
-install:
 - if test $TRAVIS_OS_NAME == linux ; then sudo apt-get install -y -qq build-essential cmake; fi
 #Install qt5
 - $SCRIPTS/travis_build_qt.sh
@@ -81,28 +79,28 @@ install:
 - if test $TRAVIS_OS_NAME == osx ; then if [[ "$QT_VERSION" == "4.8.7" ]] ; then ln -s /usr/local/Cellar/qt@4/4.8.7_1/plugins /usr/local/plugins; fi; fi
 - if test $TRAVIS_OS_NAME == osx ; then qmake -v; fi
 
-cache:
-install:
- - timeout: 999
- - directories:
-   - $HOME/vtk-5.10
-   - $HOME/vtk-5.10-build
-   - $HOME/vtk-6.3
-   - $HOME/vtk-6.3-build
-   - $HOME/vtk-7.0.0
-   - $HOME/vtk-7.0.0-build
-   - $HOME/itk-4.5
-   - $HOME/itk-4.5-build
-   - $HOME/itk-4.9.1
-   - $HOME/itk-4.9.1-build
+cache: ccache
+#install:
+# - timeout: 1000
+directories:
+ - $HOME/vtk-5.10
+ - $HOME/vtk-5.10-build
+ - $HOME/vtk-6.3
+ - $HOME/vtk-6.3-build
+ - $HOME/vtk-7.0.0
+ - $HOME/vtk-7.0.0-build
+ - $HOME/itk-4.5
+ - $HOME/itk-4.5-build
+ - $HOME/itk-4.9.1
+ - $HOME/itk-4.9.1-build
 
 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
 - echo $PATH
 - $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