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

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 18771ac..d067f6b 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -39,6 +39,15 @@
 fi
 
 source $PWD/scripts/CreaTools-configure.sh
+#EED 2017-03-24
+  source $PWD/scripts/LocalFunctions.sh
+  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+  then
+	stdCompiler=c++98
+  else
+	stdCompiler=c++03
+  fi
+
 
    echo "------"
    echo $PWD/scripts/CreaTools-configure.sh
@@ -69,25 +78,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"
@@ -97,15 +106,26 @@ fi
   cd $sourcesDir
 
   echo "we download new stuff"
- if [ $OperatingSystem = "MacOS" ]
- 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
-  tar -xvzf gdcm_05_Mai_2011.tar.gz
- fi
+  
+##  if [ $OperatingSystem = "MacOS" ]
+##  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
+## ##19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+## 
+## ##VTK-5
+## #    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+## #  	tar -xvzf gdcm_05_Mai_2011.tar.gz
+## 
+## #    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_10_Mars_2017-vtk7.tar.gz
+## #	tar -xvzf gdcm13_2018_05_28_vtk8.tar.gz
+##  fi
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip
+  	unzip gdcm13_2018_05_28_vtk8.zip
+#  	mv gdcm13_2018_05_28_vtk8 gdcm
 
 if [ $buildType = "Debug" ]
 then
@@ -118,19 +138,20 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm
+  libname=gdcm13_2018_05_28_vtk8
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
-  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 CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird 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
+  cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
   make -j $corenumber
-  make install
+  make -j $corenumber install
   cd ..
 fi