X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=91e06a75958320ed91ead68b4dd6a283bac59dda;hb=d3fa23cdd313b5209461d6011a4aeb306350aff8;hp=c6e456e4c4217ff8783774bc80eccc0b06f9d323;hpb=fa4fbd3991c17689ef149ac73c69cdd00c0e64a0;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh index c6e456e..91e06a7 100644 --- a/Linux/scripts/ThirdParty-install-ITK.sh +++ b/Linux/scripts/ThirdParty-install-ITK.sh @@ -69,6 +69,17 @@ source $PWD/scripts/CreaTools-configure.sh echo "------" +#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 + + + scriptDir=$PWD sourcesDir=$generationdir/thirdparty_sources binDir=$generationdir/thirdparty_bin @@ -164,12 +175,12 @@ then then cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D ITKGroup_IO:BOOL=ON -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON CMakeCache.txt fi - cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt + cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt #uncomment following line if you want to use the bleeding edge of GDCM2! #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt cmake CMakeCache.txt - make -j - make install + make -j $corenumber + make -j $corenumber install cd .. fi