From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Tue, 29 Aug 2017 20:09:35 +0000 (+0200)
Subject: #3118 creaToolsTools Feature New Normal  -  branch changestoITK3and4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c1d297b6469b7364fe12febc0a2d07b82d5f86b6;p=creaToolsTools.git

#3118 creaToolsTools Feature New Normal  -  branch changestoITK3and4
---

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 91e06a7..d3ad3f5 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=ITK4.0.tgz
-    libname=ITK
+    itkfile=InsightToolkit-4.12.1.tar.gz
+    libname=InsightToolkit-4.12.1
   fi
 
   if [ $OperatingSystem = "MacOS" ]
@@ -145,6 +145,7 @@ fi
 ##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
   fi
+
   tar -xzvf $itkfile
 
 
@@ -173,7 +174,13 @@ then
   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        
+
+##EED ITK4.0
+#     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        
+
+##EED ITK4.12
+     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON -D ITK_USE_SYSTEM_GDCM=ON CMakeCache.txt        
+
   fi
   cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt