From 632adadb8b9230458aeab8ddccc736d674edc87a Mon Sep 17 00:00:00 2001 From: tbaudier Date: Tue, 18 Sep 2018 11:40:39 +0200 Subject: [PATCH] Add VTK 8.1.1 and ITK 5 beta Clean travis script 4/n --- .travis.yml | 12 ++++++------ travis/travis_build_qt.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45a9f70..4801d62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,14 +19,14 @@ env: - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.9.1 QT_VERSION=4.8.7 C11=false - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.9.1 QT_VERSION=5.5.1 C11=false - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false - - WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.b01 QT_VERSION=5.5.1 C11=false + - WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=false - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.9.1 QT_VERSION=4.8.7 C11=true - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.9.1 QT_VERSION=5.5.1 C11=true - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.9.1 QT_VERSION=4.8.7 C11=true - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.9.1 QT_VERSION=5.5.1 C11=true - WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true - - WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.b01 QT_VERSION=5.5.1 C11=true + - WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=true matrix: exclude: @@ -44,7 +44,7 @@ matrix: env: WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false - os: linux compiler: clang - env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=false + env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=false - os: linux compiler: clang env: WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true @@ -53,19 +53,19 @@ matrix: env: WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true - os: linux compiler: clang - env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=true + env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=true - os: osx env: WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false - os: osx env: WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false - os: osx - env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=flase + env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=flase - os: osx env: WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true - os: osx env: WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true - os: osx - env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=true + env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0b01 QT_VERSION=5.5.1 C11=true language: cpp diff --git a/travis/travis_build_qt.sh b/travis/travis_build_qt.sh index 7fffb00..12e137b 100755 --- a/travis/travis_build_qt.sh +++ b/travis/travis_build_qt.sh @@ -7,7 +7,7 @@ if [ "$QT_VERSION" == "4.8.7" ]; then elif [ "$QT_VERSION" == "5.5.1" ]; then if test $TRAVIS_OS_NAME == linux ; then sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty; fi if test $TRAVIS_OS_NAME == linux ; then sudo apt-get update -qq; fi - if test $TRAVIS_OS_NAME == linux ; then sudo apt-get -y --force-yes install qt55tools; fi + if test $TRAVIS_OS_NAME == linux ; then sudo apt-get -y --force-yes install qt55tools qt55x11extras; fi fi if test $TRAVIS_OS_NAME == osx ; then brew install qt5; fi if test $TRAVIS_OS_NAME == osx ; then brew link qt5 --force; fi -- 2.47.1