X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=dcc579d8d8d75e9a42aa1c78dfce4bcbfb03d380;hb=2778417a909f19f22a8ba4d6d8bdc1fa3982b926;hp=17af67160f11614daa9cfb2c1e66aa745de64a6b;hpb=c06edf8f066f0491a9c5f63b8240a2f84d22e10e;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 17af671..dcc579d 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -14,7 +14,10 @@
    echo
    exit 0
 fi
-
+echo $PWD/scripts/CreaTools-configure.sh
+echo --- beg
+more $PWD/scripts/CreaTools-configure.sh
+echo --- end
 source $PWD/scripts/CreaTools-configure.sh
 
    echo "------"
@@ -31,6 +34,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo --ITKVersion--
+   echo $ITKVersion
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--
@@ -68,21 +73,39 @@ 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
+     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
+     else
+        wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+     fi
+     tar -xzvf InsightToolkit-3.20.0.tar.gz
+  else
+    #  deal with ITK4
+    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
+  fi
+
+#fi # JPR ------------1
 
 if [ $buildType = "Debug" ]
 then
@@ -95,7 +118,13 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=InsightToolkit-3.20.0
+  if [ $ITKVersion = ITK3 ]
+  then
+     libname=InsightToolkit-3.20.0
+  else
+     libname=ITK
+  fi
+
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
   mkdir $dirInstall
@@ -105,6 +134,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