From f48c960aef6e0a5a4edea516b062197db009e25f Mon Sep 17 00:00:00 2001 From: tbaudier Date: Mon, 17 Sep 2018 16:49:43 +0200 Subject: [PATCH] Add VTK 8.1.1 and ITK 5 beta Clean travis script --- .travis.yml | 59 ++++++++++++++++++++++---------------- travis/travis_build_itk.sh | 24 +++------------- travis/travis_build_vtk.sh | 20 ++++++------- 3 files changed, 46 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1d3ba9..ef110b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,34 +12,25 @@ compiler: - gcc - clang env: - - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=5.5.1 C11=false - - 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.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 - - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=true - - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false - - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=false - - WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true - - WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.13.0 QT_VERSION=5.5.1 C11=true + - WITH_CMAKE=true VTK_VERSION=v5.10.0 ITK_VERSION=v4.6.0 QT_VERSION=4.8.7 C11=false + - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.9.1 QT_VERSION=4.8.7 C11=false + - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.9.1 QT_VERSION=5.5.1 C11=false + - WITH_CMAKE=true VTK_VERSION=v6.3.0 ITK_VERSION=v4.13.0 QT_VERSION=5.5.1 C11=false + - 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=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 matrix: exclude: - - os: 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.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 - env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=true #Qt4 doesn't work with brew anymore - - os: osx - env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=false - - os: osx - env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.9.1 QT_VERSION=4.8.7 C11=true + - 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 - os: linux @@ -51,12 +42,30 @@ matrix: - os: linux compiler: clang env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.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 - 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 - os: linux compiler: clang env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.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 + - os: osx + env: WITH_CMAKE=true VTK_VERSION=6.3 ITK_VERSION=4.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 + - os: osx + env: WITH_CMAKE=true VTK_VERSION=8.1.1 ITK_VERSION=5.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 + - os: osx + env: WITH_CMAKE=true VTK_VERSION=7.0.0 ITK_VERSION=4.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 language: cpp diff --git a/travis/travis_build_itk.sh b/travis/travis_build_itk.sh index ed6f89e..e5b55dd 100755 --- a/travis/travis_build_itk.sh +++ b/travis/travis_build_itk.sh @@ -4,27 +4,11 @@ MAKE="make --jobs=$NUM_THREADS --keep-going" #Prepare cmake arguments following the ITK version if [ "$C11" == "true" ]; then - 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" - 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.13.0" ]; then - itk_repo_str=" --branch v4.13.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 " - fi + itk_repo_str=" --branch "$ITK_VERSION" 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 " else - 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" - cmake_arg_str=" -DModule_ITKVtkGlue=ON -DVTK_DIR=$VTK_DIR -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF " - elif [ "$ITK_VERSION" == "4.13.0" ]; then - itk_repo_str=" --branch v4.13.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 " - fi + itk_repo_str=" --branch "$ITK_VERSION" 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 " fi if [ -d $ITK_SOURCE_DIR ]; then diff --git a/travis/travis_build_vtk.sh b/travis/travis_build_vtk.sh index f4dbf32..76c2685 100755 --- a/travis/travis_build_vtk.sh +++ b/travis/travis_build_vtk.sh @@ -10,8 +10,8 @@ fi #Prepare cmake arguments following the VTK version if [ "$C11" == "true" ]; then - if [ "$VTK_VERSION" == "5.10" ]; then - vtk_repo_str=" --branch v5.10.0 https://github.com/Kitware/VTK.git --depth 1" + vtk_repo_str=" --branch "$VTK_VERSION" https://github.com/Kitware/VTK.git --depth 1" + if [ "$VTK_VERSION" == "v5.10.0" ]; then cmake_arg_str=" $cmake_arg_str -DCMAKE_CXX_FLAGS=-std=c++11 -DBUILD_SHARED_LIBS=1 @@ -23,8 +23,7 @@ if [ "$C11" == "true" ]; then -DVTK_USE_RENDERING=ON -DVTK_USE_VIEWS=ON -DVTK_QT_VERSION="$QT_MAJOR_VERSION" " - elif [ "$VTK_VERSION" == "6.3" ]; then - vtk_repo_str=" --branch v6.3.0 https://github.com/Kitware/VTK.git --depth 1" + elif [ "$VTK_VERSION" == "v6.3.0" ] || [ "$VTK_VERSION" == "v8.1.1" ]; then cmake_arg_str=" $cmake_arg_str -DCMAKE_CXX_FLAGS=-std=c++11 -DBUILD_SHARED_LIBS=1 @@ -45,8 +44,7 @@ if [ "$C11" == "true" ]; then -DModule_vtkRenderingQt=ON -DModule_vtkViewsQt=ON -DVTK_QT_VERSION="$QT_MAJOR_VERSION" " - elif [ "$VTK_VERSION" == "7.0.0" ]; then - vtk_repo_str=" --branch v7.0.0 https://github.com/Kitware/VTK.git --depth 1" + elif [ "$VTK_VERSION" == "v7.0.0" ]; then cmake_arg_str=" $cmake_arg_str -DCMAKE_CXX_FLAGS=-std=c++11 -DBUILD_SHARED_LIBS=1 @@ -70,8 +68,8 @@ if [ "$C11" == "true" ]; then -DVTK_QT_VERSION="$QT_MAJOR_VERSION" " fi else - if [ "$VTK_VERSION" == "5.10" ]; then - vtk_repo_str=" --branch v5.10.0 https://github.com/Kitware/VTK.git --depth 1" + vtk_repo_str=" --branch "$VTK_VERSION" https://github.com/Kitware/VTK.git --depth 1" + if [ "$VTK_VERSION" == "v5.10.0" ]; then cmake_arg_str=" $cmake_arg_str -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release @@ -82,8 +80,7 @@ else -DVTK_USE_RENDERING=ON -DVTK_USE_VIEWS=ON -DVTK_QT_VERSION="$QT_MAJOR_VERSION" " - elif [ "$VTK_VERSION" == "6.3" ]; then - vtk_repo_str=" --branch v6.3.0 https://github.com/Kitware/VTK.git --depth 1" + elif [ "$VTK_VERSION" == "v6.3.0" ]; then cmake_arg_str=" $cmake_arg_str -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release @@ -103,8 +100,7 @@ else -DModule_vtkRenderingQt=ON -DModule_vtkViewsQt=ON -DVTK_QT_VERSION="$QT_MAJOR_VERSION" " - elif [ "$VTK_VERSION" == "7.0.0" ]; then - vtk_repo_str=" --branch v7.0.0 https://github.com/Kitware/VTK.git --depth 1" + elif [ "$VTK_VERSION" == "v7.0.0" ]; then cmake_arg_str=" $cmake_arg_str -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -- 2.47.1