From 9e7e56cb28da4c72b219c36755b622267f60ff24 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 21 Oct 2022 18:11:08 +0200 Subject: [PATCH] TTK: Debian 9 - -DTTK_ENABLE_CPU_OPTIMIZATION=OFF --- products/compil_scripts/PERSALYS-v12.0.sh | 2 +- products/compil_scripts/PERSALYS-v13.0.sh | 4 +++- products/compil_scripts/TTK.sh | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/products/compil_scripts/PERSALYS-v12.0.sh b/products/compil_scripts/PERSALYS-v12.0.sh index 150ca65..ac677e0 100755 --- 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 150ca65..2353318 100755 --- 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 d8b3b91..c03cee2 100755 --- 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 -- 2.39.2