Add fftw dependency and add sections in config files (petsc, fftw); add compilation...

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index ae57723fc33e0387b5ad2dfcf8b6e5d608889cfc..a48a8fd721d5dc1a7e6387eaaa88fbd6708fa1ae 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -60,6 +60,7 @@ APPLICATION :
         embree : '3.12.2'
         FMILibrary : '2.0.3'
         fonttools : '4.48.1'
+        fftw : {tag : '3.3.10', section: 'version_3_3_10', base: 'no'}
         freeimage : '3.16.0'
         freetype : '2.9.1'
         gcc  :  '8.5.0'

diff --git a/products/compil_scripts/fftw-3.3.10.sh b/products/compil_scripts/fftw-3.3.10.sh
index 82728f9a8f918dce6b3bc9dfb59a0cf434292b83..f4660bd91d5e96b1ae1bea5fc00131222923d74c 100755 (executable)
--- a/products/compil_scripts/fftw-3.3.10.sh
+++ b/products/compil_scripts/fftw-3.3.10.sh
@@ -16,7 +16,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-echo 
+echo
 echo "*** make"
 make
 if [ $? -ne 0 ]; then
@@ -24,7 +24,7 @@ if [ $? -ne 0 ]; then
     exit 2
 fi
 
-echo 
+echo
 echo "*** make install"
 make install
 if [ $? -ne 0 ]; then

diff --git a/products/petsc.pyconf b/products/petsc.pyconf
index 78fa630fa2dec8e9c31020d4c8b2e849de83aae7..6256fe451c6b2b03f602e7a2ac4d5d9462d229c6 100644 (file)
--- a/products/petsc.pyconf
+++ b/products/petsc.pyconf
@@ -21,17 +21,10 @@ default :
     post_script: "fix_permissions.sh"
 }
 
-version_3_20_0 :
-{
-    compil_script :  "petsc-3.20.0.sh"
-    depend : ["hdf5", "Python", "lapack","fftw", "llvm", "metis", "medfile" ]
-}
-
 version_3_19_4 :
 {
     compil_script :  "petsc-3.19.4.sh"
-    depend : ["hdf5", "Python", "lapack","fftw", "llvm", "metis", "medfile" ]
-    patches: ['petsc-3.19.4-mpi4py.patch','petsc-3.19.4-libpath.patch']
+    depend : ["hdf5", "Python", "lapack","fftw", "llvm"]
 }
 
 version_3_17_0 :