From 1710bf642fb4203d89a8722581f1be669542bd54 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Wed, 22 Nov 2023 09:46:18 +0100 Subject: [PATCH] remove solverlabGUI from SOLVERLAB --- products/SOLVERLAB.pyconf | 1 - products/compil_scripts/SOLVERLAB.sh | 0 products/compil_scripts/SOLVERLAB_cv.sh | 67 +++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) mode change 100755 => 100644 products/compil_scripts/SOLVERLAB.sh create mode 100755 products/compil_scripts/SOLVERLAB_cv.sh diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf index 48d18ed..4c43dfa 100644 --- a/products/SOLVERLAB.pyconf +++ b/products/SOLVERLAB.pyconf @@ -28,7 +28,6 @@ default : 'MEDCOUPLING' ] build_depend : ["cmake", "swig", "doxygen", "graphviz","cppunit"] - opt_depend : ['packagespy'] # mscgen source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh old mode 100755 new mode 100644 diff --git a/products/compil_scripts/SOLVERLAB_cv.sh b/products/compil_scripts/SOLVERLAB_cv.sh new file mode 100755 index 0000000..4c343f7 --- /dev/null +++ b/products/compil_scripts/SOLVERLAB_cv.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +echo "##########################################################################" +echo "SOLVERLAB" $VERSION +echo "##########################################################################" + +rm -rf $BUILD_DIR +mkdir $BUILD_DIR +cd $BUILD_DIR + + + +CMAKE_OPTIONS= +CMAKE_OPTIONS+=" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}" +CMAKE_OPTIONS+=" -DPython_EXECUTABLE=${PYTHONBIN}" +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}" +CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_TRACE=OFF" +CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_TRACE_COLORED=OFF" +CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_DOCUMENTATION=OFF" + + + + #if [ -n "$SAT_HPC" ]; then + CMAKE_OPTIONS+=" -DMPI_ROOT_DIR=${MPI_ROOT_DIR}" + CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_MPI=ON" + if [ -n "$MPI_ROOT_DIR" ]; then + CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}" + CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" + fi + if [ -n "$MPI4PY_ROOT_DIR" ]; then + CMAKE_OPTIONS+=" -DMPI4PY_ROOT_DIR:PATH=${MPI4PY_ROOT_DIR}" + else + echo "WARNING: mpi4py environment variable not detected" + CMAKE_OPTIONS+=" -DMPI4PY_ROOT_DIR:PATH=/home/catA/wambeke/.local/lib/python3.9/site-packages" + # "/export/home/catA/wambeke/SALOME_9_11/SALOME-9.11.0-native-FD34/INSTALL/ParaView/lib/python3.9/site-packages/mpi4py" + fi + #fi + +export MPI4PY_ROOT_DIR="/home/catA/wambeke/.local/lib/python3.9/site-packages" + +echo +echo "*** cmake "$CMAKE_OPTIONS +cmake $CMAKE_OPTIONS $SOURCE_DIR +if [ $? -ne 0 ]; then + echo "ERROR on cmake" + exit 1 +fi + + +echo +echo "*** make" $MAKE_OPTIONS +make $MAKE_OPTIONS +if [ $? -ne 0 ]; then + echo "ERROR on make" + exit 2 +fi + +echo +echo "*** make doc install" +make docCDMATH docCoreFlows install +if [ $? -ne 0 ]; then + echo "ERROR on make install" + exit 3 +fi + +echo +echo "########## END" -- 2.39.2