X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=61ba301a8e980026b5269cf74739a015ed39ffef;hb=c7cbdaae00e1c26ca7b0a862a6198b204bcb797d;hp=d4ef1474665ea22941dcea07a8a68e862d265b13;hpb=5ceecf6dda6a78fc6cefb8e9f8774f2a287a3729;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index d4ef147..61ba301 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
+#EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
 
 if [ ! -e $generationdir ]
 then
@@ -73,21 +74,40 @@ then
 fi
 
   echo "we remove old stuff"
-  rm -rf $sourcesDir/InsightToolkit*
-  rm -rf $binDir/InsightToolkit*
-
+  if [ $ITKVersion = ITK3 ]
+  then
+     rm -rf $sourcesDir/InsightToolkit*
+     rm -rf $binDir/InsightToolkit*
+  else
+     rm -rf $sourcesDir/ITK*
+     rm -rf $binDir/ITKt*
+  fi
   cd $sourcesDir
 
  echo "we download new stuff"
- if [ $OperatingSystem = "MacOS" ]
- then
-  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
-  tar -xvf InsightToolkit-3.20.0.tar.gz
- else
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-  tar -xzvf InsightToolkit-3.20.0.tar.gz
- fi
+  if [ $ITKVersion = ITK3 ]
+  then
+     # deal with ITK3
+     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+     #EED libname=InsightToolkit-3.20.0
+     itkfile=InsightToolkit-3.20.1.tar.gz
+     libname=InsightToolkit-3.20.1
+  else
+    # 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/$itkfile
+  else
+      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
+  fi
+  tar -xzvf $itkfile
+
+
+#fi # JPR ------------1
 
 if [ $buildType = "Debug" ]
 then
@@ -100,7 +120,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=InsightToolkit-3.20.0
+
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
   mkdir $dirInstall
@@ -110,6 +130,10 @@ then
   ##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 BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+  if [ $ITKVersion = ITK4 ]
+  then
+     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D  ITKGroup_IO:BOOL=ON  -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON  CMakeCache.txt        
+  fi
   #uncomment following line if you want to use the bleeding edge of GDCM2!
   #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt
   cmake CMakeCache.txt