From e5a92a61141e697d69e12a8eb159300ac6a2f9e0 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Tue, 10 Apr 2018 16:58:20 +0200 Subject: [PATCH] Change from minimal version of ITK4.5 to ITK4.6 --- .travis.yml | 12 ++++++------ travis/travis_build_itk.sh | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 506e3d9..a1d3ba9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=false - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=5.5.1 C11=false - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=false - - WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7 C11=false + - WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.6 QT_VERSION=4.8.7 C11=false - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=5.5.1 C11=true - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=true - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=5.5.1 C11=true @@ -29,9 +29,9 @@ env: matrix: exclude: - os: osx - env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7 C11=false #VTK5.10 doesn't work with osX + env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.6 QT_VERSION=4.8.7 C11=false #VTK5.10 doesn't work with osX - os: osx - env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7 C11=true #VTK5.10 doesn't work with osX + env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.6 QT_VERSION=4.8.7 C11=true #VTK5.10 doesn't work with osX - os: osx env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=false #Qt4 doesn't work with brew anymore - os: osx @@ -41,7 +41,7 @@ matrix: - os: osx env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=true - os: linux - env: WITH_CMAKE=true VTK_VERSION=5.10 ITK_VERSION=4.5 QT_VERSION=4.8.7 C11=true #Problem with VTK 5.10 and c++11 + 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 - os: linux compiler: clang #Remove ITK with clang on linux include: @@ -107,8 +107,8 @@ cache: - $HOME/vtk-6.3-build - $HOME/vtk-7.0.0 - $HOME/vtk-7.0.0-build - - $HOME/itk-4.5 - - $HOME/itk-4.5-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 diff --git a/travis/travis_build_itk.sh b/travis/travis_build_itk.sh index ffcdff0..ed6f89e 100755 --- a/travis/travis_build_itk.sh +++ b/travis/travis_build_itk.sh @@ -4,8 +4,8 @@ MAKE="make --jobs=$NUM_THREADS --keep-going" #Prepare cmake arguments following the ITK version if [ "$C11" == "true" ]; then - if [ "$ITK_VERSION" == "4.5" ]; then - itk_repo_str=" --branch v4.5.0 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" + if [ "$ITK_VERSION" == "4.6" ]; then + itk_repo_str=" --branch v4.6.0 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" cmake_arg_str=" -DCMAKE_CXX_FLAGS=-std=c++11 -DModule_ITKVtkGlue=ON -DVTK_DIR=$VTK_DIR -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF " elif [ "$ITK_VERSION" == "4.9.1" ]; then itk_repo_str=" --branch v4.9.1 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" @@ -15,8 +15,8 @@ if [ "$C11" == "true" ]; then cmake_arg_str=" -DCMAKE_CXX_FLAGS=-std=c++11 -DModule_ITKVtkGlue=ON -DVTK_DIR=$VTK_DIR -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF " fi else - if [ "$ITK_VERSION" == "4.5" ]; then - itk_repo_str=" --branch v4.5.0 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" + if [ "$ITK_VERSION" == "4.6" ]; then + itk_repo_str=" --branch v4.6.0 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" cmake_arg_str=" -DModule_ITKVtkGlue=ON -DVTK_DIR=$VTK_DIR -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF " elif [ "$ITK_VERSION" == "4.9.1" ]; then itk_repo_str=" --branch v4.9.1 https://github.com/InsightSoftwareConsortium/ITK.git --depth 1" -- 2.45.1