X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-gdcm.sh;h=b3aa011fc3f5a6ba3f08fe2226a249d3d5b99791;hb=d3fa23cdd313b5209461d6011a4aeb306350aff8;hp=b6a3951a9a73b04e74a974015a2752022d7bc3da;hpb=1e09b8dbf8310a1a53d02e67256f12a6c0424aa7;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index b6a3951..b3aa011 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 @@ -130,8 +139,9 @@ then 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