X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=.travis.yml;h=ce53271188e155e2f65bb4bee940d52ce61e7271;hb=0b4d512916fbaf29f2f52f7f24aa9af37ce24ece;hp=47b7f33f112efd576b191435f6cf291d2606742d;hpb=aa6b838a5b6880c40ca8d9dbe72846c5812e5f93;p=clitk.git diff --git a/.travis.yml b/.travis.yml index 47b7f33..ce53271 100644 --- 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 @@ -58,8 +58,8 @@ install: cache: - 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 +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