spns #29664: omniORB: fix python path

[tools/sat_salome.git] / products / compil_scripts / gmsh-4.8.4.sh

diff --git a/products/compil_scripts/gmsh-4.8.4.sh b/products/compil_scripts/gmsh-4.8.4.sh
index dc7a95c3fdc74dfb49784d53e64e5768baf06c74..0bed6cb9d409002eac47430b06864a39bd393771 100755 (executable)
--- a/products/compil_scripts/gmsh-4.8.4.sh
+++ b/products/compil_scripts/gmsh-4.8.4.sh
@@ -25,7 +25,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PRIVATE_API=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF" # default value is set to ON in release 4.1.4
 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}" # set path of third libraries to our associated internal products
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_OPENMP=1"
+CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_OPENMP=ON"     # get OpenMP based parallelism working
+CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PLUGINS=OFF"   # needed for correct GmshFinalize() after version 4.3.0
 if [[ $DIST_NAME == "FD" && $DIST_VERSION == "32" ]]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_MMG3D=OFF" # removed anyhow in GMS 4.6
@@ -59,17 +60,20 @@ then
 fi
 
 echo
-echo "*** copy all .h in sources to install"
-cp -f --backup=numbered `find $SOURCE_DIR -name "*.h"` $PRODUCT_INSTALL/include/ && \
-    mv $PRODUCT_INSTALL/include/gmsh/* $PRODUCT_INSTALL/include/ && \
-    rmdir $PRODUCT_INSTALL/include/gmsh/
-if [ $? -ne 0 ]
-then
-    echo "ERROR on copy"
-    exit 4
+if [ -n "$SALOME_GMSH_HEADERS_STD" ]; then
+    echo "Using standard directory structure"
+else
+    echo "*** copy all .h in sources to install"
+    cp -f --backup=numbered `find $SOURCE_DIR -name "*.h"` $PRODUCT_INSTALL/include/ && \
+        mv $PRODUCT_INSTALL/include/gmsh/* $PRODUCT_INSTALL/include/ && \
+        rmdir $PRODUCT_INSTALL/include/gmsh/
+    if [ $? -ne 0 ]
+    then
+        echo "ERROR on copy"
+        exit 4
+    fi
 fi
 
-
 echo
 echo "########## END"