spns #26828: convergence EDF: native build

diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh
index e280b70848a3a321990e37f0062e954b11069065..7c060c786dcb95abc7ae839cd800dbf8be438f77 100755 (executable)
--- a/products/compil_scripts/PERSALYS-v11.0.sh
+++ b/products/compil_scripts/PERSALYS-v11.0.sh
@@ -4,36 +4,10 @@ echo "##########################################################################
 echo "PERSALYS" $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
-    echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
-fi
-
-CMAKE_OPTIONS=""
-CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=$PRODUCT_INSTALL"
-CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
-CMAKE_OPTIONS+=" -DADAO_ROOT_DIR=$ADAO_ROOT_DIR"
-CMAKE_OPTIONS+=" -DADAO_INTERFACE_ROOT_DIR=$ADAO_INTERFACE_ROOT_DIR"
-#CMAKE_OPTIONS+=" -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR}"
-CMAKE_OPTIONS+=" -DGUI_ROOT_DIR=$GUI_ROOT_DIR"
-CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=$KERNEL_ROOT_DIR"
-CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OPENTURNS_ROOT_DIR"
-CMAKE_OPTIONS+=" -DPY2CPP_ROOT_DIR=$PY2CPP_ROOT_DIR"
-CMAKE_OPTIONS+=" -DPYTHON_ROOT_DIR=$PYTHON_ROOT_DIR"
-CMAKE_OPTIONS+=" -DQWT_ROOT_DIR=$QWT_ROOT_DIR"
-#!/bin/bash
-
-echo "##########################################################################"
-echo "PERSALYS" $VERSION
-echo "##########################################################################"
-
-if [ -n "$MPI_ROOT_DIR" ]
-then
+if [ -n "$SAT_HPC" ]  && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
 
 CMAKE_OPTIONS=""

diff --git a/products/compil_scripts/gdal-2.4.0.sh b/products/compil_scripts/gdal-2.4.0.sh
index 9147a9827d459409d61ace02893fbeeb0ede5b28..483ba9614e18d7e0021ab67ea4741538c9428cb6 100755 (executable)
--- a/products/compil_scripts/gdal-2.4.0.sh
+++ b/products/compil_scripts/gdal-2.4.0.sh
@@ -28,11 +28,6 @@ HDF5_LIBS="-L${HDF5_ROOT_DIR}/lib/ -lhdf5 -L${HDF5_ROOT_DIR}/lib/libhdf5_hl.so -
 HDF5_INCLUDE="-I${HDF5_ROOT_DIR}/include"
 
 CONFIGURE_FLAGS=
-#CONFIGURE_FLAGS+=" LDFLAGS=\"$LDFLAGS\""
-#CONFIGURE_FLAGS+=" HDF5_CFLAGS=\"$HDF5_CFLAGS\""
-#CONFIGURE_FLAGS+=" LIBS=\"$LIBS\""
-#CONFIGURE_FLAGS+=" HDF5_LIBS=\"$HDF5_LIBS\""
-#CONFIGURE_FLAGS+=" HDF5_INCLUDE=\"$HDF5_INCLUDE\""
 CONFIGURE_FLAGS+=" --with-pcraster=internal"
 CONFIGURE_FLAGS+=" --with-png=internal"
 CONFIGURE_FLAGS+=" --with-libtiff=internal"

diff --git a/products/compil_scripts/netcdf-4.6.2.sh b/products/compil_scripts/netcdf-4.6.2.sh
index af342c8adfe72f9e21044bc2c2fbcd55553eac78..cc883b9665f01c47218d868224940478a6155665 100755 (executable)
--- a/products/compil_scripts/netcdf-4.6.2.sh
+++ b/products/compil_scripts/netcdf-4.6.2.sh
@@ -15,7 +15,7 @@ CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DENABLE_NETCDF_4=ON"
 CMAKE_OPTIONS+=" -DENABLE_DAP=ON"
-CMAKE_OPTIONS+=" -BUILD_UTILITIES=ON"
+CMAKE_OPTIONS+=" -DBUILD_UTILITIES=ON"
 CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS=ON"
 CMAKE_OPTIONS+=" -DENABLE_TESTS=ON"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"

diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index cb5601c33eef0b0b066ddd477e519a59403547d0..76f9d8cd0ada88461e8e374c29b95df21d2440f1 100644 (file)
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -19,7 +19,7 @@ default :
         rpm_dev : ["openssl-devel", "tbb-devel", "gcc", "make", "sed", "gcc-c++", "expat-devel", "fontconfig-devel", "flex",
                    "bison", "mesa-libGLU-devel", "libxcb-devel", "xcb-util-devel", "libxkbcommon-devel", "libxkbcommon-x11-devel",
                    "bzip2-devel", "libXi-devel", "libXmu-devel", "automake", "libtool", "libjpeg-turbo-devel", "cmake",
-                   "libXpm-devel", "libXft-devel", "sqlite-devel"]
+                   "libXpm-devel", "libXft-devel", "sqlite-devel", "libcurl-devel"]
         apt : ["libbsd0", "libbz2-1.0", "libc6", "libdc1394-22", "libdrm2", "libegl1", "libexif12", "libexpat1",
                "libfftw3-double3", "libfontconfig1", "libgl1", "libglu1-mesa", "libgomp1", "libgphoto2-6", "libice6",
                "libjbig0", "libltdl7", "liblzma5", "libncurses5", "libnuma1", "libpcre3", "libquadmath0",
@@ -30,7 +30,7 @@ default :
         apt_dev : ["libssl-dev", "gcc", "make", "sed", "g++", "libexpat1-dev", "libfontconfig1-dev", "flex", "bison",
                    "libglu1-mesa-dev", "perl", "libxcb-dri2-0-dev", "libxkbcommon-dev", "libxkbcommon-x11-dev", "bzip2",
                    "libxi-dev", "libxt-dev", "libxmu-dev", "libxpm-dev", "libxft-dev", "automake", "libtool", "libjpeg-dev",
-                   "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev"]
+                   "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev", "libcurl4-openssl-dev"]
 
         # specific to some platform(s)
         "CO7" :