X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=travis%2Ftravis_build_vtk.sh;h=f4dbf32532edc1766cabc8ada6d2ff99a86cf66f;hb=03a3dde77c4de04ce6f0af2f8d6eda4cf0fb6e41;hp=14649bc5e1762f5065f0ebe4a98ebc860ca79be3;hpb=aa6b838a5b6880c40ca8d9dbe72846c5812e5f93;p=clitk.git

diff --git a/travis/travis_build_vtk.sh b/travis/travis_build_vtk.sh
index 14649bc..f4dbf32 100755
--- a/travis/travis_build_vtk.sh
+++ b/travis/travis_build_vtk.sh
@@ -9,70 +9,123 @@ 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"
-cmake_arg_str=" $cmake_arg_str 
-  -DBUILD_SHARED_LIBS=1
-  -DCMAKE_BUILD_TYPE=Release
-  -DBUILD_TESTING=0
-  -DBUILD_EXAMPLES=0
-  -DBUILD_DOCUMENTATION=0
-  -DVTK_Group_StandAlone=ON
-  -DVTK_Group_Imaging=OFF
-  -DVTK_Group_MPI=OFF
-  -DVTK_Group_Rendering=ON
-  -DVTK_Group_Tk=OFF
-  -DVTK_Group_Views=OFF
-  -DVTK_Group_Web=OFF
-  -DModule_vtkGUISupportQt=ON
-  -DModule_vtkGUISupportQtOpenGL=ON
-  -DModule_vtkGUISupportQtSQL=ON
-  -DModule_vtkRenderingQt=ON
-  -DModule_vtkViewsQt=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"
-cmake_arg_str=" $cmake_arg_str 
-  -DBUILD_SHARED_LIBS=1
-  -DCMAKE_BUILD_TYPE=Release
-  -DBUILD_TESTING=0
-  -DBUILD_EXAMPLES=0
-  -DBUILD_DOCUMENTATION=0
-  -DVTK_Group_StandAlone=ON
-  -DVTK_Group_Imaging=OFF
-  -DVTK_Group_MPI=OFF
-  -DVTK_Group_Rendering=ON
-  -DVTK_Group_Tk=OFF
-  -DVTK_Group_Views=OFF
-  -DVTK_Group_Web=OFF
-  -DModule_vtkGUISupportQt=ON
-  -DModule_vtkGUISupportQtOpenGL=ON
-  -DModule_vtkGUISupportQtSQL=ON
-  -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"
-cmake_arg_str=" $cmake_arg_str
-  -DBUILD_SHARED_LIBS=1
-  -DCMAKE_BUILD_TYPE=Release
-  -DBUILD_TESTING=0
-  -DBUILD_EXAMPLES=0
-  -DBUILD_DOCUMENTATION=0
-  -DVTK_Group_StandAlone=ON
-  -DVTK_Group_Imaging=OFF
-  -DVTK_Group_MPI=OFF
-  -DVTK_Group_Rendering=ON
-  -DVTK_Group_Tk=OFF
-  -DVTK_Group_Views=OFF
-  -DVTK_Group_Web=OFF
-  -DVTK_RENDERING_BACKEND=OpenGL
-  -DModule_vtkGUISupportQt=ON
-  -DModule_vtkGUISupportQtOpenGL=ON
-  -DModule_vtkGUISupportQtSQL=ON
-  -DModule_vtkRenderingQt=ON
-  -DModule_vtkViewsQt=ON
-  -DVTK_QT_VERSION="$QT_MAJOR_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"
+  cmake_arg_str=" $cmake_arg_str
+    -DCMAKE_CXX_FLAGS=-std=c++11
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_USE_QT=ON
+    -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"
+  cmake_arg_str=" $cmake_arg_str
+    -DCMAKE_CXX_FLAGS=-std=c++11
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_Group_StandAlone=ON
+    -DVTK_Group_Imaging=OFF
+    -DVTK_Group_MPI=OFF
+    -DVTK_Group_Rendering=ON
+    -DVTK_Group_Tk=OFF
+    -DVTK_Group_Views=OFF
+    -DVTK_Group_Web=OFF
+    -DModule_vtkGUISupportQt=ON
+    -DModule_vtkGUISupportQtOpenGL=ON
+    -DModule_vtkGUISupportQtSQL=ON
+    -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"
+  cmake_arg_str=" $cmake_arg_str
+    -DCMAKE_CXX_FLAGS=-std=c++11
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_Group_StandAlone=ON
+    -DVTK_Group_Imaging=OFF
+    -DVTK_Group_MPI=OFF
+    -DVTK_Group_Rendering=ON
+    -DVTK_Group_Tk=OFF
+    -DVTK_Group_Views=OFF
+    -DVTK_Group_Web=OFF
+    -DVTK_RENDERING_BACKEND=OpenGL
+    -DModule_vtkGUISupportQt=ON
+    -DModule_vtkGUISupportQtOpenGL=ON
+    -DModule_vtkGUISupportQtSQL=ON
+    -DModule_vtkRenderingQt=ON
+    -DModule_vtkViewsQt=ON
+    -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"
+  cmake_arg_str=" $cmake_arg_str
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_USE_QT=ON
+    -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"
+  cmake_arg_str=" $cmake_arg_str
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_Group_StandAlone=ON
+    -DVTK_Group_Imaging=OFF
+    -DVTK_Group_MPI=OFF
+    -DVTK_Group_Rendering=ON
+    -DVTK_Group_Tk=OFF
+    -DVTK_Group_Views=OFF
+    -DVTK_Group_Web=OFF
+    -DModule_vtkGUISupportQt=ON
+    -DModule_vtkGUISupportQtOpenGL=ON
+    -DModule_vtkGUISupportQtSQL=ON
+    -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"
+  cmake_arg_str=" $cmake_arg_str
+    -DBUILD_SHARED_LIBS=1
+    -DCMAKE_BUILD_TYPE=Release
+    -DBUILD_TESTING=0
+    -DBUILD_EXAMPLES=0
+    -DBUILD_DOCUMENTATION=0
+    -DVTK_Group_StandAlone=ON
+    -DVTK_Group_Imaging=OFF
+    -DVTK_Group_MPI=OFF
+    -DVTK_Group_Rendering=ON
+    -DVTK_Group_Tk=OFF
+    -DVTK_Group_Views=OFF
+    -DVTK_Group_Web=OFF
+    -DVTK_RENDERING_BACKEND=OpenGL
+    -DModule_vtkGUISupportQt=ON
+    -DModule_vtkGUISupportQtOpenGL=ON
+    -DModule_vtkGUISupportQtSQL=ON
+    -DModule_vtkRenderingQt=ON
+    -DModule_vtkViewsQt=ON
+    -DVTK_QT_VERSION="$QT_MAJOR_VERSION" "
+  fi
 fi
 
 if [ -d $VTK_SOURCE_DIR ]; then