spns #43020: fix compilation scripts

diff --git a/products/compil_scripts/cgal-v5.6.1.sh b/products/compil_scripts/cgal-v5.6.1.sh
index bb783e6a9de24a5db2e5164967c71d3731e701d6..ad4972d479f8eb9549d7050f35804750fbdbc916 100755 (executable)
--- a/products/compil_scripts/cgal-v5.6.1.sh
+++ b/products/compil_scripts/cgal-v5.6.1.sh
@@ -11,9 +11,9 @@ cd $BUILD_DIR
 CMAKE_OPTIONS=
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 if [ -n "$SAT_DEBUG" ]; then
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
 else
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 fi
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DWITH_examples=ON"

diff --git a/products/compil_scripts/cork.sh b/products/compil_scripts/cork.sh
index 7c85ad4a87e5d1fd1b0e4c26117f41aa76b4108f..2e9e79aeb8286ae33a29900d66c73c03f502e830 100755 (executable)
--- a/products/compil_scripts/cork.sh
+++ b/products/compil_scripts/cork.sh
@@ -13,7 +13,7 @@ echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
 if [ $? -ne 0 ]; then
     echo "ERROR on make"
-    exit 2
+    exit 1
 fi
 
 echo
@@ -25,7 +25,7 @@ for f in $(ls $BUILD_DIR/bin); do
     mv $BUILD_DIR/bin/$f $F
     if [ $? -ne 0 ]; then
         echo "ERROR on make install for file: $f"
-        exit 4
+        exit 2
     fi
     if [ ! -L "$F" ]; then
         chmod 755 $F
@@ -36,13 +36,13 @@ cd $PRODUCT_INSTALL/bin
 mv cork cork_bin
 if [ $? -ne 0 ]; then
     echo "ERROR on make install for file: $f"
-    exit 5
+    exit 3
 fi
 
 cp -r ${BUILD_DIR}/include ${PRODUCT_INSTALL}/include
 if [ $? -ne 0 ]; then
     echo "ERROR on make install: could not copy include directory..."
-    exit 5
+    exit 4
 fi
 
 echo

diff --git a/products/compil_scripts/irmb.sh b/products/compil_scripts/irmb.sh
index 428cd45cb2b8df4d2bf93b92e85bbf97baec1467..55dc7c773d8c0ddcc7a2d50846219d60e0108a3a 100755 (executable)
--- a/products/compil_scripts/irmb.sh
+++ b/products/compil_scripts/irmb.sh
@@ -11,9 +11,9 @@ cd $BUILD_DIR
 CMAKE_OPTIONS=
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 if [ -n "$SAT_DEBUG" ]; then
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
 else
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 fi
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 

diff --git a/products/compil_scripts/libigl-v2.5.0.sh b/products/compil_scripts/libigl-v2.5.0.sh
index f21e4fb61d1f2667111dc8b85f54aeb1bab9c6ca..c0148ff5adf4cebb55bac1f67275bb37fbb359d5 100755 (executable)
--- a/products/compil_scripts/libigl-v2.5.0.sh
+++ b/products/compil_scripts/libigl-v2.5.0.sh
@@ -11,9 +11,9 @@ cd $BUILD_DIR
 CMAKE_OPTIONS=
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 if [ -n "$SAT_DEBUG" ]; then
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
 else
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 fi
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 

diff --git a/products/compil_scripts/mcut.sh b/products/compil_scripts/mcut.sh
index 20fcb39159c896a2b6e0d4bb7dd84e5e29ce28c3..a569965c2c98b0fba7b7c8c2d0cdee4e1dc92958 100755 (executable)
--- a/products/compil_scripts/mcut.sh
+++ b/products/compil_scripts/mcut.sh
@@ -11,9 +11,9 @@ cd $BUILD_DIR
 CMAKE_OPTIONS=
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 if [ -n "$SAT_DEBUG" ]; then
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
 else
-    CMAKE_OPTIONS_COMMON+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 fi
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DLIBIGL_INCLUDE_DIR=${LIBIGL_INCLUDE_DIR}"

diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index d5e5477d20ba7f18546217bd30920996bde30b2f..352c409b624c90b60f0b6e5aeb0547b2aa32bedb 100644 (file)
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -126,11 +126,11 @@ default :
         {
             apt : ["libdc1394-25", "libopenexr-3-1-30", "libwebp7", "libgfortran5", "libevent-2.1-7", "libpng16-16", "libgcc",
                    "libffi8", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp25",
-                   "openmpi-bin", "libnetcdf19", "libgdal32", "libtbb12", "python3-setuptools", "libxml++2.6-2v5", "liblzf1", "libfreetype6", "libncurses5"]
+                   "openmpi-bin", "libnetcdf19", "libgdal32", "libtbb12", "python3-setuptools", "libxml++2.6-2v5", "liblzf1", "libfreetype6", "libncurses5", "libgmp10", "libmpfr6"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
                        "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev",
                        "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev",
-                       "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev"]
+                       "texlive-latex-base", "texlive-latex-extra", "dvipng", "libxml++2.6-dev", "libfreetype6-dev", "libgmp-dev","libmpfr-dev"]
         }
         "UB16.04" :
         {