X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-VTK.sh;h=c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15;hb=d3fa23cdd313b5209461d6011a4aeb306350aff8;hp=b944735a85a54731f0403b0b3eeaa2d05823332b;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index b944735..c8b269c 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -64,31 +64,42 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+#EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+	stdCompiler=c++98
+  else
+	stdCompiler=c++03
+  fi
+
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 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"
@@ -101,14 +112,43 @@ 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
+  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 :-(
-  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
  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
+
+  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 
+
  fi
 
+
+
+
 #if [ $buildType = "Debug" ]
 #then
 #   debug="ON"
@@ -120,11 +160,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/
-  mkdir $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
+##  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
@@ -134,7 +176,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
@@ -144,7 +186,10 @@ then
   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=${stdCompiler} CMakeCache.txt
+
+##EED 2016-12-22  make -j $corenumber
   make -j $corenumber
-  make install
+  make -j $corenumber install
   cd ..
 fi