]> Creatis software - creaToolsTools.git/commitdiff
#3432 creaToolsTools Bug New Normal - gdcm in Fedora 31
authorEduardo DAVILA <davila@localhost.localdomain>
Tue, 26 May 2020 09:33:35 +0000 (11:33 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Tue, 26 May 2020 09:33:35 +0000 (11:33 +0200)
Linux/scripts/ThirdParty-install-gdcm.sh

index 11725e913d8f302346ffc2dd2b7282c008cee0c7..12265a6dd987a684d088562b1f0819c35be5b65a 100644 (file)
 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 ..