From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 24 Feb 2014 12:30:25 +0000 (+0100)
Subject: 2313	creaToolsTools	Feature	New	Normal	Install VTK 5.10.1 for the ThirdPartyLibraries... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=950b1c901133e6a1b2bc5f179b3b8f6c60f902d5

2313	creaToolsTools	Feature	New	Normal	Install VTK 5.10.1 for the ThirdPartyLibraries in Linux version
---

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index e9fb058..f1d99b7 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.6/
+export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
 
 
@@ -63,7 +63,7 @@ touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
 
 echo export PATH='$'PATH:$installPrefixThird/bin           >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6        >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export VTK_DIR=$installPrefixThird/lib/vtk-5.10        >> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit >> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export GDCM_DIR=$installPrefixThird/lib/gdcm          >> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export TTH=$installPrefixThird/bin/tth                >> $installPrefixThird/share/creatools_third_party_library_config.sh
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index b944735..7ab1f31 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -101,12 +101,26 @@ fi
  echo "we download new stuff"
  if [ $OperatingSystem = "MacOS" ]
  then
-  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+
+## EED 2013-10-29
+##  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+##  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+##  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
+
+  curl -O http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
   # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
-  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
+  unzip vtk-5.10.1.zip
+
  else
-  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
+
+## 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
  fi
 
 #if [ $buildType = "Debug" ]
@@ -120,11 +134,13 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK
+  libname=VTK5.10.1
   dirInstall=$binDir/$libname-Bin
-  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+  export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+
   mkdir $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
   cd $dirInstall
 
 # See EED why we have to do this