spns #43007: added fftw for embedded salome

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 20c64074cee8552ec59b84c573ccc6b2ae936c7f..e4f3ed7552e6bdd572414d6cc1a3f7d91128df2f 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -62,6 +62,7 @@ APPLICATION :
         eigen : '3.3.4'
         embree : '3.12.2'
         FMILibrary : '2.0.3'
+        fftw : '3.3.10'
         fonttools : '4.48.1'
         freeimage : '3.16.0'
         freetype : '2.9.1'

diff --git a/products/compil_scripts/fftw.sh b/products/compil_scripts/fftw.sh
new file mode 100755 (executable)
index 0000000..ba0fa55
--- /dev/null
+++ b/products/compil_scripts/fftw.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "FFTW" $VERSION
+echo "##########################################################################"
+
+CONFIGURE_OPTIONS=
+if [ -n "${SAT_HPC}" ]; then
+    CONFIGURE_OPTIONS+=" --enable-mpi"
+fi
+
+if [ -n "${SAT_DEBUG}" ]; then
+    CONFIGURE_OPTIONS+=" --enable-debug"
+fi
+
+CFLAGS_OPTIONS=
+#CFLAGS_OPTIONS+=" -fPIC"
+
+
+echo
+echo "*** configure --prefix=${PRODUCT_INSTALL} --enable-shared ${CONFIGURE_OPTIONS} CFLAGS=${CFLAGS_OPTIONS}"
+${SOURCE_DIR}/configure --prefix=${PRODUCT_INSTALL} --enable-shared \
+    ${CONFIGURE_OPTIONS} \
+    CFLAGS=${CFLAGS_OPTIONS}
+
+if [ $? -ne 0 ]; then
+    echo "ERROR on configure"
+    exit 1
+fi
+
+echo
+echo "*** make"
+make
+if [ $? -ne 0 ]; then
+    echo "ERROR on make"
+    exit 2
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]; then
+    echo "ERROR on make install"
+    exit 3
+fi
+
+echo
+echo "########## END"

diff --git a/products/fftw.pyconf b/products/fftw.pyconf
index 691580887690ed39f4a177e9a1122283d8ff6c4a..e1a1f255493842ca4ab67d65071684618b6cb1ba 100644 (file)
--- a/products/fftw.pyconf
+++ b/products/fftw.pyconf
@@ -7,9 +7,9 @@ default :
     system_info : 
     {
         rpm : ["fftw"]
-        rpm_dev : ["fftw-devel", "fftw-openmpi-devel"]
+        rpm_dev : ["fftw-devel"] #, "fftw-openmpi-devel"
         apt : ["fftw"]
-        apt_dev : ["fftw-dev", "libfftw3-mpi-dev"]
+        apt_dev : ["fftw-dev"] #, "libfftw3-mpi-dev"
     }
     archive_info:
     {