TTK: Debian 9 - -DTTK_ENABLE_CPU_OPTIMIZATION=OFF

diff --git a/products/compil_scripts/PERSALYS-v12.0.sh b/products/compil_scripts/PERSALYS-v12.0.sh
index 150ca652e60f2f810cbfcbffe9ee94cdc2c3d9fc..ac677e08edadb96a2cd7d9fc06a4ffef495dc072 100755 (executable)
--- a/products/compil_scripts/PERSALYS-v12.0.sh
+++ b/products/compil_scripts/PERSALYS-v12.0.sh
@@ -32,7 +32,7 @@ elif [ "$SAT_qwt_IS_NATIVE" != "1" ]; then
     CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include"
 fi
 
-if [[ "$DIST_NAME$DIST_VERSION" == "8" ]]; then
+if [[ "$DIST_NAME$DIST_VERSION" == "CO8" ]]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # missing tex-preview LateX package for CentOS 8
 elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" #

diff --git a/products/compil_scripts/PERSALYS-v13.0.sh b/products/compil_scripts/PERSALYS-v13.0.sh
index 150ca652e60f2f810cbfcbffe9ee94cdc2c3d9fc..23533185dcaaa350d7b109a37510d76cdeb3422b 100755 (executable)
--- a/products/compil_scripts/PERSALYS-v13.0.sh
+++ b/products/compil_scripts/PERSALYS-v13.0.sh
@@ -32,8 +32,10 @@ elif [ "$SAT_qwt_IS_NATIVE" != "1" ]; then
     CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include"
 fi
 
-if [[ "$DIST_NAME$DIST_VERSION" == "8" ]]; then
+if [[ "$DIST_NAME$DIST_VERSION" == "CO8" ]]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # missing tex-preview LateX package for CentOS 8
+elif [[ "$DIST_NAME$DIST_VERSION" == "CO7" ]]; then
+    CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # missing tex-preview LateX package for CentOS 7 - à installer
 elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" #
 else

diff --git a/products/compil_scripts/TTK.sh b/products/compil_scripts/TTK.sh
index d8b3b9103843c846b33fc0fe728bfab0c89653ea..c03cee2e5033e883a03e40ac5b61c717308befa2 100755 (executable)
--- a/products/compil_scripts/TTK.sh
+++ b/products/compil_scripts/TTK.sh
@@ -20,13 +20,14 @@ CMAKE_OPTIONS+=" -DEMBREE_INCLUDE_DIR=${EMBREE_ROOT_DIR}/include"
 LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
 
 case $LINUX_DISTRIBUTION in
-    DB10)
-       # A.Geay (Sous debian10 sur nos VM de prod, on a pas mal de nos tests qui plantent avec des SIGILL)
-       echo "WARNING: switching off cpu optimization!"
-       CMAKE_OPTIONS+=" -DTTK_ENABLE_CPU_OPTIMIZATION=OFF"
-       ;;
+    DB09|DB10)
+        # A.Geay (Sous debian10 sur nos VM de prod, on a pas mal de nos tests qui plantent avec des SIGILL)
+        # D.Hoang: application à Debian 9
+        echo "WARNING: switching off cpu optimization!"
+        CMAKE_OPTIONS+=" -DTTK_ENABLE_CPU_OPTIMIZATION=OFF"
+        ;;
     *)
-       ;;
+        ;;
 esac
 
 echo