From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Wed, 18 Jan 2017 10:26:26 +0000 (+0100)
Subject: change vtk version 6.0 to 5.10
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=18b0ffe4829efd101d1b6dab66841adec6e7f73f;p=clitk.git

change vtk version 6.0 to 5.10
---

diff --git a/.travis.yml b/.travis.yml
index 47b7f33..0d8bcc7 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
diff --git a/travis/travis_build_vtk.sh b/travis/travis_build_vtk.sh
index 14649bc..5b7e7e8 100755
--- a/travis/travis_build_vtk.sh
+++ b/travis/travis_build_vtk.sh
@@ -9,8 +9,8 @@ elif [ "$QT_VERSION" == "5.5.1" ]; then
 fi
 
 #Prepare cmake arguments following the VTK version
-if [ "$VTK_VERSION" == "6.0" ]; then
-vtk_repo_str=" --branch v6.0.0 https://github.com/Kitware/VTK.git --depth 1"
+if [ "$VTK_VERSION" == "5.10" ]; then
+vtk_repo_str=" --branch v5.10.0 https://github.com/Kitware/VTK.git --depth 1"
 cmake_arg_str=" $cmake_arg_str 
   -DBUILD_SHARED_LIBS=1
   -DCMAKE_BUILD_TYPE=Release