From: Eduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Tue, 21 Aug 2018 12:48:20 +0000 (+0200)
Subject: #3224 creaToolsTools Feature New Normal  -  vtk8itk4wx3-mingw64
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dac02daf71d53323c10c1a0dc7e8a8b95b31e325;p=creaToolsTools.git

#3224 creaToolsTools Feature New Normal  -  vtk8itk4wx3-mingw64
---

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 2b6eac5..a08a8ec 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -134,8 +134,8 @@ fi
 
   else
     # deal with ITK4
-    itkfile=InsightToolkit-4.12.1.tar.gz
-    libname=InsightToolkit-4.12.1
+    itkfile=InsightToolkit-4.13.1.zip
+    libname=InsightToolkit-4.13.1
   fi
 
   if [ $OperatingSystem = "MacOS" ]
@@ -144,10 +144,10 @@ fi
   else
 ##EED19mai2015      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
       wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+##  tar -xzvf $itkfile
   fi
 
-  tar -xzvf $itkfile
-  
+  unzip  $itkfile
 
 
 #fi # JPR ------------1
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index efe7f32..4c9db74 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -143,8 +143,9 @@ fi
 ##  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
-	unzip VTK-7.1.0.zip
+##	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
 
@@ -201,13 +202,14 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK-7.1.0
+  libname=VTK-8.1.1
+  libnameB=vtk-8.1
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
+  export VTK_DIR=$installPrefixThird/lib/cmake/$libnameB/
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-7.1/
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/$libnameB/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -229,8 +231,8 @@ then
 
   cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
+  cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=OFF CMakeCache.txt  
 
-##EED 2016-12-22  make -j $corenumber
   make -j $corenumber
   make -j $corenumber install
   cd ..
diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
index 9ddfaef..8feeec6 100644
--- a/Linux/scripts/ThirdParty-install-WT.sh
+++ b/Linux/scripts/ThirdParty-install-WT.sh
@@ -106,10 +106,12 @@ fi
   tar -xvzf wt-3.3.4.tar.gz
   # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
  else
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
-  echo tar -xvzf wt-3.3.4.tar.gz
-  pwd
-  tar -xvzf wt-3.3.4.tar.gz
+#  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+#  tar -xvzf wt-3.3.4.tar.gz
+
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-4.0.4-rc1.tar.gz
+  tar -xvzf wt-4.0.4-rc1.tar.gz
+
  fi
 
 
@@ -124,13 +126,14 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=wt-3.3.4
+##  libname=wt-3.3.4
+  libname=wt-4.0.4-rc1
   dirInstall=$binDir/$libname-Bin
-##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+##  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+  export WT_DIR=$installPrefixThird/lib/$libname
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/wt-3.3.4/
+  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/$libname/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -141,8 +144,8 @@ then
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
-  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=true ENABLE_MYSQL:BOOL=false CMakeCache.txt
-  cmake -D BUILD_TESTS:BOOL=false CMakeCache.txt
+  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=ON ENABLE_MYSQL:BOOL=OFF CMakeCache.txt
+  cmake -D BUILD_TESTS:BOOL=OFF CMakeCache.txt
 #  if [ $OperatingSystem = "MacOS" ]
 #  then
 #     ###
diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 3563f6f..5183c5f 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -118,8 +118,11 @@ fi
 #    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
 #  	tar -xvzf gdcm_05_Mai_2011.tar.gz
 
-    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_10_Mars_2017-vtk7.tar.gz
-  	tar -xvzf gdcm_10_Mars_2017-vtk7.tar.gz
+#    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_10_Mars_2017-vtk7.tar.gz
+#	tar -xvzf gdcm13_2018_05_28_vtk8.tar.gz
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip
+  	unzip gdcm13_2018_05_28_vtk8.zip
 
  fi