From a269baa59cf6be3ab152788d4179ed59a6d9e263 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 10 Aug 2011 13:36:22 +0000 Subject: [PATCH] *** empty log message *** --- Linux/scripts/ThirdParty-install-ITK.sh | 36 +++++++++++-------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh index 858c583..b8a79b7 100644 --- a/Linux/scripts/ThirdParty-install-ITK.sh +++ b/Linux/scripts/ThirdParty-install-ITK.sh @@ -48,6 +48,7 @@ source $PWD/scripts/CreaTools-configure.sh scriptDir=$PWD sourcesDir=$generationdir/thirdparty_sources binDir=$generationdir/thirdparty_bin +itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz if [ ! -e $generationdir ] then @@ -86,24 +87,23 @@ fi echo "we download new stuff" if [ $ITKVersion = ITK3 ] then - # deal with ITK3 - if [ $OperatingSystem = "MacOS" ] - then - curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.patchCreatis.tar.gz - else - wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.patchCreatis.tar.gz - fi - tar -xzvf InsightToolkit-3.20.0.tar.gz + # deal with ITK3 + itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz + libname=InsightToolkit-3.20.0 else - # deal with ITK4 - if [ $OperatingSystem = "MacOS" ] + # deal with ITK4 + itkfile=ITK4.0.tgz + libname=ITK + fi + + if [ $OperatingSystem = "MacOS" ] then - curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz - else - wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz - fi - tar -xzvf ITK4.0.tgz + curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile + else + wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile fi + tar -xzvf $itkfile + #fi # JPR ------------1 @@ -118,12 +118,6 @@ fi #if [ true = false ] if [ true = true ] then - if [ $ITKVersion = ITK3 ] - then - libname=InsightToolkit-3.20.0 - else - libname=ITK - fi dirInstall=$binDir/$libname-Bin export ITK_DIR=$installPrefixThird/lib/InsightToolkit/ -- 2.47.1