X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=.travis.yml;h=028ccb8063448a9812256f031d75d54697a08f56;hb=8b99436ccbdc216bb3e327ad2e9fa17d9882157e;hp=b42b7a24e4632305c88a140b56882ba7de5d4cb3;hpb=36eb2caae682275262b66370b6c131c8b566421b;p=clitk.git diff --git a/.travis.yml b/.travis.yml index b42b7a2..028ccb8 100644 --- 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,8 +79,8 @@ 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: +cache: ccache +#install: # - timeout: 1000 directories: - $HOME/vtk-5.10 @@ -100,9 +98,9 @@ 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