From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 10 Mar 2017 01:19:31 +0000 (+0100)
Subject: vtk7itk4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f72c23ad27b59b6476718ebb6ef1d5755601ac41;p=creaToolsTools.git

vtk7itk4
---

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 83e2569..886650a 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -44,7 +44,7 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
 export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
 
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 1c65f68..dcc347b 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -118,20 +118,22 @@ fi
 ## EED 2013-10-29
 ##  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
 ##  tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
-  wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
 
-echo unzip vtk-5.10.1.zip
-pwd
-  unzip vtk-5.10.1.zip
-
-  cd VTK5.10.1/Rendering
-##EED19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-
-  cd ../CMake
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
-  patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH 
+## EED 2016-12-28
+##  wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
+##  echo unzip vtk-5.10.1.zip
+##  pwd
+##  unzip vtk-5.10.1.zip
+##  cd VTK5.10.1/Rendering
+####EED19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+##  cd ../CMake
+##  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+##  patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH 
+
+	wget http://www.vtk.org/files/release/7.1/VTK-7.1.0.zip
+	unzip VTK-7.1.0.zip
 
  fi
 
@@ -145,17 +147,56 @@ pwd
 #   debug="OFF"
 #fi
 
+### the following stupid test is used at debug time; Please don't remove!
+###if [ true = false ]
+##if [ true = true ]
+##then
+##  libname=VTK5.10.1
+##  dirInstall=$binDir/$libname-Bin
+####  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+##  export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+##
+##  mkdir -p $dirInstall
+##  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+##  cd $dirInstall
+##
+### See EED why we have to do this
+##  if [ $OperatingSystem = "MacOS" ]
+##  then
+##     cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+##  fi
+##  cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+##  ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+##  cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+##
+##  if [ $OperatingSystem = "MacOS" ]
+##  then
+##    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D  VTK_USE_COCOA:BOOL=OFF CMakeCache.txt
+##    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
+##    CMakeCache.txt
+##  fi
+##
+##  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
+##  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+##
+####EED 2016-12-22  make -j $corenumber
+##  make -j $corenumber
+##  make -j $corenumber install
+##  cd ..
+##fi
+
+
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK5.10.1
+  libname=VTK-7.1.0
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+  export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-7.1/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -163,6 +204,7 @@ then
   then
      cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
   fi
+
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
@@ -174,11 +216,18 @@ then
     CMakeCache.txt
   fi
 
-  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+  cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON  CMakeCache.txt
+  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
+##??  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
 
 ##EED 2016-12-22  make -j $corenumber
   make -j $corenumber
   make -j $corenumber install
   cd ..
+
 fi
+
+
+
+
+