X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-VTK.sh;h=a6a63fb489ca1e1a2843cbbc56c8c482040444bb;hb=1e09b8dbf8310a1a53d02e67256f12a6c0424aa7;hp=806296692adb3c3b1795369320d9e92b8eba8426;hpb=f513924db3c927ac3c0e765731487572f25fcf1c;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 8062966..a6a63fb 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"
@@ -125,7 +125,8 @@ 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
+##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
  fi
 
@@ -148,7 +149,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
 
@@ -159,7 +160,7 @@ then
   fi
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
-  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+  cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
 
   if [ $OperatingSystem = "MacOS" ]
   then