#3447 Fedora 34

diff --git a/Linux/scripts/CreaTools-configure.sh b/Linux/scripts/CreaTools-configure.sh
index 804697bf4fe2b61913d74658723fde39c135d1e7..ee396a98cb22399a52ebbb04dec8011ebf4742f9 100644 (file)
--- 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 b35b8bfe30742aa9a44e1b84964fb9e36ca25c39..244119c6494e43d6df05528dc679e2bb54255069 100644 (file)
--- 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 fb97632963a0e26a12a7f8ca75508c52596fe72c..2f511c824d4ce4b9e81fab61f96343a6c65458bb 100644 (file)
--- 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 42938fa32c8dfbd59a4c19f4da915cd42c4faec7..53c72d7ddfa66761dac052193c800b0f0719001f 100644 (file)
--- 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 68b124e5953665bdb7a6ca2b5b7c9f8688cc99f1..86c4f34fa313a3c71048cecdb013cd75ef872ff9 100644 (file)
--- 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 6a5a75f3499622aaa504317cdd3567d32c5fd2f9..c61c8db47711fd0c5b40d5c85f7d102ab1d2e8a2 100644 (file)
--- 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 720091e3eadfbf2434646019337c89624390871c..81b7e85f50a7cf9c8905d979e22e001b6ab509bf 100644 (file)
--- 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 b21641218247fbcc3e1fcee3b91ac105692ca970..853d5d448834fe1acbc12c9b6cda06138b7e6655 100644 (file)
--- 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