Merge branch 'vtk8itk5wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/creaToolsTools...

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 31027efc287a3f34ed2c7c2c23c71732a0ecc429..c2b9c1be57f510adf37189e15c5c549577d72518 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -37,6 +37,11 @@
   if [ -e $generationdir ]
   then
 
+#--------Active SSH agent to the next operations---------------------------------------------------------
+       echo "Active SSH agent to copy files to the Cluster:"
+       ssh-add 
+
+
 #--------CreaTools-Bin  for Package developers---------------------------------------------------------
 
        echo generationdir:
@@ -97,6 +102,8 @@
                cp /usr/lib64/libicudata.so.60 .
                cp /usr/lib64/libicui18n.so.60 . 
                cp /usr/lib64/libicuuc.so.60 . 
+               ## For Fedora 32
+               cp /usr/lib64/libGLU.so.1 . 
        fi
 
        cd ../..

diff --git a/Linux/scripts/CreaTools-configure.sh b/Linux/scripts/CreaTools-configure.sh
index f0bf3b36d7667a63c67848569fa799bad4a9eedd..bce150b87b54dcefba718b19f7075012e1721a62 100644 (file)
--- a/Linux/scripts/CreaTools-configure.sh
+++ b/Linux/scripts/CreaTools-configure.sh
@@ -5,10 +5,10 @@
 #(except if you *do* know what you do)
 
 OperatingSystem=Fedora
-corenumber=4
-generationdir=/home/davila/Creatis/C10
-installPrefix=/home/davila/Creatis/C10/ci
-installPrefixThird=/home/davila/Creatis/C10/tpli
+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

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index c063cbddd3e292705d1bc979cb00bcc489f6e70d..ebb66383d13752271206c3bd4085370e7e8d3aa0 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -196,6 +196,7 @@ then
 ##  fi
 
   cmake -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
+  cmake -D ITKV4_COMPATIBILITY:BOOL=ON  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!