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=5fcdfbfb11dc76ddbbc4e7b157b26cfe8e2d21ac;hpb=ad3162bceb1cbf58006ce6d0a5c8945468755130;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 5fcdfbf..6c53b48 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 #!/bin/bash
 
  echo  "in ThirdParty-install-ITK.sh, source " $PWD/scripts/CreaTools-configure.sh
@@ -45,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
@@ -52,25 +87,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -85,26 +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
-     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
+#  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
+
+    itkfile=InsightToolkit-5.0.1.zip
+    libname=InsightToolkit-5.0.1
+
+
+##  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
+
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+  unzip  $itkfile
 
 
 #fi # JPR ------------1
@@ -123,21 +171,34 @@ then
 
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   cd $dirInstall
 
   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