From: Nabil Ghodbane Date: Tue, 6 Dec 2022 17:14:00 +0000 (+0100) Subject: spns #32377: switch off CGNS support for GMSH until issue fixed X-Git-Tag: V9_11_0~159 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1dc9ca7dd7a818eae976fbc89ac15a8362862b41;p=tools%2Fsat_salome.git spns #32377: switch off CGNS support for GMSH until issue fixed --- diff --git a/products/compil_scripts/gmsh-4.10.3.sh b/products/compil_scripts/gmsh-4.10.3.sh index bef11b9..c15d408 100755 --- a/products/compil_scripts/gmsh-4.10.3.sh +++ b/products/compil_scripts/gmsh-4.10.3.sh @@ -24,19 +24,7 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_ONELAB_METAMODEL=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PARSER=ON" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PETSC=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PRIVATE_API=ON" -if [ -n "$CGNS_ROOT_DIR" ]; then - # GMSH relies on the presence of this environment variable. - export CGNS_ROOT=$CGNS_ROOT_DIR - if [ "${SAT_cgns_IS_NATIVE}" != "1" ]; then - # ensure that we are picking up the correct CGNS library - # e.g. Debian 10, cgns is centrally installed, CGNS_LIB will not target the embedded CGNS - # which will lead to compilation issue. - export LD_LIBRARY_PATH=$CGNS_ROOT/lib:$LD_LIBRARY_PATH - fi - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=ON" -else - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF" -fi +CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_LIBDIR=${PRODUCT_INSTALL}/lib" # strangely on Ubuntu GMSH installs the .so in lib instead of lib/lib64 - so force to lib64 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_PREFIX_PATH=${LAPACK_ROOT_DIR};${HDF5_ROOT_DIR};${MEDFILE_ROOT_DIR};" # set path of third libraries to our associated internal products CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_OPENMP=ON" # get OpenMP based parallelism working