X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-gdcm.sh;h=18771acf05847046a24a0840e8934713444e0ef2;hb=dbc17ccf7ebbbea53ee77802ea1c8667c01f8d9b;hp=a0d65e4487a74fce51d05b876d23ca8a6fb8c139;hpb=4f9f17bfd98a80e233f9f9e93ea84c92e2aaf7cb;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index a0d65e4..18771ac 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.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
 
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
@@ -66,28 +90,23 @@ then
    chgrp $loginGroupName $binDir
 fi
 
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-
+  echo "we remove old stuff"
   rm -rf $sourcesDir/gdcm*
-
   rm -rf $binDir/gdcm*
 
   cd $sourcesDir
 
+  echo "we download new stuff"
  if [ $OperatingSystem = "MacOS" ]
  then
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
-  tar -xvf gdcm_05_Mai_2011.tar.gz   
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf gdcm_05_Mai_2011.tar.gz
  else
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz 
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
   tar -xvzf gdcm_05_Mai_2011.tar.gz
  fi
 
-fi
-
 if [ $buildType = "Debug" ]
 then
    debug="ON"
@@ -104,12 +123,13 @@ then
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir $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 VTK_DIR:PATH=$dirInstallVTK CMakeCache.txt
+  cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-  make -j 2
+  make -j $corenumber
   make install
   cd ..
 fi