From: Eduardo Davila <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Tue, 28 Aug 2018 13:04:10 +0000 (+0200)
Subject: #3224 creaToolsTools Feature New Normal  -  vtk8itk4wx3-mingw64
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4c9139ed6dd8c10cd099e908bfd9d0caa2d53d52;p=creaToolsTools.git

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

diff --git a/Linux/installscript b/Linux/installscript
index 04c273d..b48f202 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -261,17 +261,15 @@ fi
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    source scripts/ThirdParty-install-gdcm.sh
+#    source scripts/ThirdParty-install-gdcm.sh
     cd $scriptDirName
 fi
 
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
-	if ! [ $OperatingSystem = "MacOS" ] ; then
-	    bigDisplay "INSTALL $ITKVersion"
-   	 	bash scripts/ThirdParty-install-ITK.sh
-    	cd $scriptDirName
-    fi
+	bigDisplay "INSTALL $ITKVersion"
+   	bash scripts/ThirdParty-install-ITK.sh
+    cd $scriptDirName
 fi
 
 # wt
diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 3fb0447..66691ef 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -68,14 +68,6 @@ source $PWD/scripts/CreaTools-configure.sh
 #   echo $start_point
    echo "------"
 
- if [ $OperatingSystem = "MacOS" ]
- then
-    # Itk is all ready installed with the macport mechanism
-    exit 0
- fi
-
-
-
 
 #EED 2017-03-24
   source $PWD/scripts/LocalFunctions.sh
@@ -146,15 +138,16 @@ fi
     libname=InsightToolkit-4.13.1
   fi
 
-  if [ $OperatingSystem = "MacOS" ]
-    then
-      curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
-  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
+##  if [ $OperatingSystem = "MacOS" ]
+##    then
+##      curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+##  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
 
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
   unzip  $itkfile