X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=6c53b48da377ebef1d04cc7f6aa855b6c2a16b20;hb=1195cf5621f8d7a36af22f32633d443e8d29221d;hp=d289d0eb50248fc557ea593ffeb2699e55ad1895;hpb=619e343d9f0beaebe43518faad2488b0f3e4bc81;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index d289d0e..6c53b48 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -69,6 +69,17 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+#EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+	stdCompiler=c++98
+  else
+	stdCompiler=c++11
+  fi
+
+
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -109,32 +120,39 @@ fi
   cd $sourcesDir
 
  echo "we download new stuff"
-  if [ $ITKVersion = ITK3 ]
-  then
-     # deal with ITK3
-     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
-     #EED libname=InsightToolkit-3.20.0
+#  if [ $ITKVersion = ITK3 ]
+#  then
+#     # deal with ITK3
+#     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+#     #EED libname=InsightToolkit-3.20.0
+#
+#     #EED itkfile=InsightToolkit-3.20.1.tar.gz
+#     #EED libname=InsightToolkit-3.20.1
+#
+#     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
+#     libname=InsightToolkit-3.20.1-patchCreatis
+#
+#  else
+#    # deal with ITK4
+#    itkfile=InsightToolkit-4.13.1.zip
+#    libname=InsightToolkit-4.13.1
+#  fi
 
-     #EED itkfile=InsightToolkit-3.20.1.tar.gz
-     #EED libname=InsightToolkit-3.20.1
+    itkfile=InsightToolkit-5.0.1.zip
+    libname=InsightToolkit-5.0.1
 
-     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
-     libname=InsightToolkit-3.20.1-patchCreatis
 
-  else
-    # deal with ITK4
-    itkfile=ITK4.0.tgz
-    libname=ITK
-  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
-  fi
-  tar -xzvf $itkfile
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+  unzip  $itkfile
 
 
 #fi # JPR ------------1
@@ -158,16 +176,29 @@ then
 
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##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
+  cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+  cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
+#  if [ $ITKVersion = ITK3 ]
+#  then
+#    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+#  fi
+#  if [ $ITKVersion = ITK4 ]
+#  then
+###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
+## -D ITK_USE_SYSTEM_GDCM=ON
+#     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
+#  fi
+ 
+   cmake -D Module_ITKReview:BOOL=ON  CMakeCache.txt     
+   cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+
   #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
   make -j $corenumber
-  make install
+  make -j $corenumber install
   cd ..
 fi