From d75738f62b199344007ef2b1cd7c1bd0e92302aa Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Sun, 27 Feb 2022 09:14:13 +0100 Subject: [PATCH] spns #26828: convergence EDF: native build --- products/compil_scripts/PERSALYS-v11.0.sh | 32 +++-------------------- products/compil_scripts/gdal-2.4.0.sh | 5 ---- products/compil_scripts/netcdf-4.6.2.sh | 2 +- products/salome_system.pyconf | 4 +-- 4 files changed, 6 insertions(+), 37 deletions(-) diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh index e280b70..7c060c7 100755 --- 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 9147a98..483ba96 100755 --- 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 af342c8..cc883b9 100755 --- 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 cb5601c..76f9d8c 100644 --- 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" : -- 2.39.2