X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-gdcm.sh;h=ed672c3613904c907fd3cddf5bb537d0e2727ee7;hb=c7cbdaae00e1c26ca7b0a862a6198b204bcb797d;hp=eda5a5dacaedc16d08a456b4d2054508d085c7a3;hpb=9855e3b70d5b519d697d6eba6d462118565c3698;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index eda5a5d..ed672c3 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -11,7 +12,7 @@
    echo
    echo
    exit 0
-fi 
+fi
 
 source $PWD/scripts/CreaTools-configure.sh
 
@@ -45,41 +46,42 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
-   chown $loginUserName:$loginGroupName $generationdir
+   chown $loginUserName  $generationdir
+   chgrp $loginGroupName $generationdir
+
 fi
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
+   #was : (pb on MacOS?)
+   #chown $loginUserName:$loginGroupName $sourcesDir
+   chown $loginUserName  $sourcesDir
+   chgrp $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
    mkdir $binDir
+   chown $loginUserName  $binDir
+   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 
- else  
+ then
+  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
@@ -88,7 +90,6 @@ else
    debug="OFF"
 fi
 
-
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
@@ -98,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