X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-gdcm.sh;h=ed672c3613904c907fd3cddf5bb537d0e2727ee7;hb=46fa7d8772214a9cf0a5ca8e208e400528e5e7c9;hp=12efd373042c7d44f9d6ce675123250c4da3e56a;hpb=b09ac6096e0e160da27ebeff3732c465244a7765;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 12efd37..ed672c3 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -66,27 +66,22 @@ 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 
+  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
- fi
-
   tar -xvzf gdcm_05_Mai_2011.tar.gz
-
-fi
+ fi
 
 if [ $buildType = "Debug" ]
 then
@@ -104,12 +99,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 GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-  make -j 2
+  make -j $corenumber
   make install
   cd ..
 fi