X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-VTK.sh;h=c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15;hb=d3fa23cdd313b5209461d6011a4aeb306350aff8;hp=1c65f683689f089531a907e7e823abeda99ba15c;hpb=252395a1ffdecd683d537710bc587c0d9752dafa;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh index 1c65f68..c8b269c 100644 --- a/Linux/scripts/ThirdParty-install-VTK.sh +++ b/Linux/scripts/ThirdParty-install-VTK.sh @@ -64,6 +64,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 @@ -175,7 +186,7 @@ then fi cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt - cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt + cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt ##EED 2016-12-22 make -j $corenumber make -j $corenumber