From 3136ffe6a9602c7cad9b9dd6db86b2716e91d32a Mon Sep 17 00:00:00 2001 From: davila Date: Thu, 9 Dec 2021 12:05:47 +0100 Subject: [PATCH] #3447 Fedora 34 --- Linux/scripts/CreaTools-configure.sh | 16 ++++++++-------- Linux/scripts/ThirdParty-install-ITK.sh | 6 ++++-- Linux/scripts/ThirdParty-install-gdcm.sh | 2 +- Linux/scripts/bbtkGEditorVariables.sh | 2 +- Linux/scripts/bbtkVariables.sh | 2 +- Linux/scripts/creaContoursVariables.sh | 2 +- Linux/scripts/creaImageIOVariables.sh | 2 +- Linux/scripts/creaMaracasVariables.sh | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Linux/scripts/CreaTools-configure.sh b/Linux/scripts/CreaTools-configure.sh index 804697b..ee396a9 100644 --- a/Linux/scripts/CreaTools-configure.sh +++ b/Linux/scripts/CreaTools-configure.sh @@ -4,17 +4,17 @@ #DO NOT edit ! #(except if you *do* know what you do) -OperatingSystem=MacOS -corenumber=8 -generationdir=/Users/davila/Creatis/C11 -installPrefix=/Users/davila/Creatis/C11/ci -installPrefixThird=/Users/davila/Creatis/C11/tpli +OperatingSystem=Fedora +corenumber=6 +generationdir=/home/davila/Creatis/C11 +installPrefix=/home/davila/Creatis/C11/ci +installPrefixThird=/home/davila/Creatis/C11/tpli docgeneration=OFF sourcesFrom=GIT loginUserName=davila -loginGroupName=staff +loginGroupName=davila buildType=Release gdcmVersion=GDCM1 ITKVersion=ITK4 -ETC_BASHRC=/Users/davila/.bashrc -TDx=ON +ETC_BASHRC=/home/davila/.bashrc +TDx=OFF diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh index b35b8bf..244119c 100644 --- a/Linux/scripts/ThirdParty-install-ITK.sh +++ b/Linux/scripts/ThirdParty-install-ITK.sh @@ -73,6 +73,7 @@ source $PWD/scripts/CreaTools-configure.sh stdCompiler=c++98 else stdCompiler=c++11 + # -std=c++11 fi @@ -135,8 +136,9 @@ fi # libname=InsightToolkit-4.13.1 # fi - itkfile=InsightToolkit-5.0.1.zip - libname=InsightToolkit-5.0.1 +# itkfile=InsightToolkit-5.0.1-patchCreatis.zip + itkfile=InsightToolkit-5.2.1.zip + libname=InsightToolkit-5.2.1 ## if [ $OperatingSystem = "MacOS" ] diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index fb97632..2f511c8 100644 --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@ -125,7 +125,7 @@ fi ## fi -cxxFlags=' ' +cxxFlags='-std=c++11 ' if [ $TDx == "ON" ] then cxxFlags=$cxxFlags'-F/Library/Frameworks -DVTK_USE_TDX ' diff --git a/Linux/scripts/bbtkGEditorVariables.sh b/Linux/scripts/bbtkGEditorVariables.sh index 42938fa..53c72d7 100644 --- a/Linux/scripts/bbtkGEditorVariables.sh +++ b/Linux/scripts/bbtkGEditorVariables.sh @@ -32,7 +32,7 @@ cd $binfolder TDx=$4 -cxxFlags='-fPIC ' +cxxFlags='-fPIC -std=c++11 ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then cxxFlags=$cxxFlags'-F/Library/Frameworks ' diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh index 68b124e..86c4f34 100644 --- a/Linux/scripts/bbtkVariables.sh +++ b/Linux/scripts/bbtkVariables.sh @@ -46,7 +46,7 @@ fi #This line es not working in MacOs #cxxFlags='-fPIC -fopenmp ' -cxxFlags='-fPIC ' +cxxFlags='-fPIC -std=c++11 ' TDx=$5 # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then diff --git a/Linux/scripts/creaContoursVariables.sh b/Linux/scripts/creaContoursVariables.sh index 6a5a75f..c61c8db 100644 --- a/Linux/scripts/creaContoursVariables.sh +++ b/Linux/scripts/creaContoursVariables.sh @@ -30,7 +30,7 @@ binfolder=$2/creatools_bin/$1Bin cd $binfolder TDx=$4 -cxxFlags='-fPIC ' +cxxFlags='-fPIC -std=c++11 ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then cxxFlags=$cxxFlags'-F/Library/Frameworks ' diff --git a/Linux/scripts/creaImageIOVariables.sh b/Linux/scripts/creaImageIOVariables.sh index 720091e..81b7e85 100644 --- a/Linux/scripts/creaImageIOVariables.sh +++ b/Linux/scripts/creaImageIOVariables.sh @@ -45,7 +45,7 @@ boolgdcm1=ON fi TDx=$5 -cxxFlags='-fPIC ' +cxxFlags='-fPIC -std=c++11 ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then cxxFlags=$cxxFlags'-F/Library/Frameworks ' diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh index b216412..853d5d4 100644 --- a/Linux/scripts/creaMaracasVariables.sh +++ b/Linux/scripts/creaMaracasVariables.sh @@ -44,7 +44,7 @@ TDx=$4 # this line is not working in MacOs #cxxFlags='-fPIC -fopenmp ' -cxxFlags='-fPIC ' +cxxFlags='-fPIC -std=c++11 ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then -- 2.47.1