From: Eduardo DAVILA Date: Tue, 26 May 2020 09:33:35 +0000 (+0200) Subject: #3432 creaToolsTools Bug New Normal - gdcm in Fedora 31 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6fdedde2a5b0499ad71d5e0eac70cf24ddbd42c8;p=creaToolsTools.git #3432 creaToolsTools Bug New Normal - gdcm in Fedora 31 --- diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index 11725e9..12265a6 100644 --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@ -39,14 +39,6 @@ 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++11 - fi echo "------" @@ -148,7 +140,14 @@ 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 + + #EED 2017-03-24 + source $PWD/scripts/LocalFunctions.sh + if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ] + then + cmake -D CMAKE_CXX_FLAGS:STRING=-std=c++98 CMakeCache.txt + fi + make -j $corenumber make -j $corenumber install cd ..