#3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64

[creaToolsTools.git] / Linux / scripts / ThirdParty-install-VTK.sh

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 4c9db74f0aa9f5ad8e4e27e29c4ff76a2e97c9fd..e2f26791d3d6a1e28219f4fe509ad5652cbfe12c 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -64,6 +64,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+ 
+
 #EED 2017-03-24
   source $PWD/scripts/LocalFunctions.sh
   if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
@@ -110,45 +112,47 @@ fi
   cd $sourcesDir
 
  echo "we download new stuff"
- if [ $OperatingSystem = "MacOS" ]
- then
-
-## 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 :-(
- else
-
-## 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
-
-## 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
-       wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip
-       unzip VTK-8.1.1.zip
-
- fi
+##   if [ $OperatingSystem = "MacOS" ]
+##   then
+##  
+## # 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 :-(
+##  else
+## 
+## ## 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
+## 
+## ## 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
+##     wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip
+##     unzip VTK-8.1.1.zip
+## 
+##  fi
 
+       wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip
+       unzip VTK-8.1.1.zip
 
 
 
@@ -224,7 +228,7 @@ then
 
   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 BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=OFF -D  VTK_USE_COCOA:BOOL=ON CMakeCache.txt
     cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
     CMakeCache.txt
   fi