X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-VTK.sh;h=cc1f017d33c1f246429b93a753a6d996735aa08c;hb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;hp=7ab1f31a8df5e26e28b953fc06caa4ef05edb990;hpb=950b1c901133e6a1b2bc5f179b3b8f6c60f902d5;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 7ab1f31..cc1f017 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -70,25 +70,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -108,9 +108,11 @@ fi
 ##  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 :-(
   unzip vtk-5.10.1.zip
-
+  cd VTK5.10.1/Rendering
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
  else
 
 ## EED 2013-10-29
@@ -121,8 +123,15 @@ fi
 echo unzip vtk-5.10.1.zip
 pwd
   unzip vtk-5.10.1.zip
+
+  cd VTK5.10.1/Rendering
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+  patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
  fi
 
+
+
+
 #if [ $buildType = "Debug" ]
 #then
 #   debug="ON"
@@ -139,7 +148,7 @@ then
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
   cd $dirInstall