Add VTK 8.1.1 and ITK 5 beta

Clean travis script 2/n

diff --git a/.travis.yml b/.travis.yml
index ef110b4d3f5f1be92dee10bb4847900c56d395f4..45a9f7046f048cad429c8180553223ebcc22f20e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,40 +32,40 @@ matrix:
   exclude:
   - os: osx #VTK5.10, Qt4, ITK < 4.13 doesn't work with osX
   - os: linux
-    env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.6 QT_VERSION=4.8.7 C11=true #Problem with VTK 5.10 and c++11
+    env: WITH_CMAKE=true VTK_VERSION=v5.10.0 ITK_VERSION=v4.6.0 QT_VERSION=4.8.7 C11=true #Problem with VTK 5.10 and c++11
   - os: linux
     compiler: clang #Remove ITK with clang on linux
   include:
   - os: linux
     compiler: clang
-    env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false
+    env: WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false
   - os: linux
     compiler: clang
-    env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false
+    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=8.1.1 ITK_VERSION=5.0.0 QT_VERSION=5.5.1 C11=false
+    env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=false
   - os: linux
     compiler: clang
-    env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true
+    env: WITH_CMAKE=true VTK_VERSION=v7.0.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=true
   - os: linux
     compiler: clang
-    env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true
+    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=8.1.1 ITK_VERSION=5.0.0 QT_VERSION=5.5.1 C11=true
+    env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=true
   - os: osx
-    env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false
+    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=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false
+    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=8.1.1 ITK_VERSION=5.0.0 QT_VERSION=5.5.1 C11=flase
+    env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=flase
   - os: osx
-    env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true
+    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=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true
+    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=8.1.1 ITK_VERSION=5.0.0 QT_VERSION=5.5.1 C11=true
+    env: WITH_CMAKE=true VTK_VERSION=v8.1.1 ITK_VERSION=v5.0.0 QT_VERSION=5.5.1 C11=true
 
 
 language: cpp
@@ -93,10 +93,10 @@ before_install:
 - export cwd=$(pwd)
 - export SCRIPTS=$cwd/travis
 - export EXTERNALS_DIR=$HOME
-- export VTK_SOURCE_DIR=${EXTERNALS_DIR}/vtk-${VTK_VERSION}
-- export VTK_DIR=${EXTERNALS_DIR}/vtk-${VTK_VERSION}-build
-- export ITK_SOURCE_DIR=${EXTERNALS_DIR}/itk-${ITK_VERSION}
-- export ITK_DIR=${EXTERNALS_DIR}/itk-${ITK_VERSION}-build
+- export VTK_SOURCE_DIR=${EXTERNALS_DIR}/vtk
+- export VTK_DIR=${EXTERNALS_DIR}/vtk-build
+- export ITK_SOURCE_DIR=${EXTERNALS_DIR}/itk
+- export ITK_DIR=${EXTERNALS_DIR}/itk-build
 - export BUILD_DIR=$cwd/build
 - if test $TRAVIS_OS_NAME == linux ; then sudo apt-get install -y -qq build-essential cmake; fi
 #Install qt5
@@ -110,18 +110,10 @@ before_install:
 
 cache:
  - 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.6
-   - $HOME/itk-4.6-build
-   - $HOME/itk-4.9.1
-   - $HOME/itk-4.9.1-build
-   - $HOME/itk-4.13.0
-   - $HOME/itk-4.13.0-build
+   - $HOME/vtk
+   - $HOME/vtk-build
+   - $HOME/itk
+   - $HOME/itk-build
    - '$HOME/.sonar/cache'
  - timeout: 10000