From c685a453cb84e5d31ad50ce9e9f5eedf86de9015 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 28 Feb 2023 13:00:22 +0100 Subject: [PATCH] improve variable detection --- products/compil_scripts/ParaView-5.11.0.sh | 3 +-- products/compil_scripts/ParaView-5.8.0.sh | 3 +-- products/compil_scripts/ParaView-5.9.0.sh | 3 +-- products/compil_scripts/med-4.1.1.sh | 3 +-- products/compil_scripts/med.sh | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh index bd934d1..6407a6f 100755 --- a/products/compil_scripts/ParaView-5.11.0.sh +++ b/products/compil_scripts/ParaView-5.11.0.sh @@ -80,8 +80,7 @@ else fi ### VTK general settings -if [ -n "$SALOME_USE_64BIT_IDS" ] -then +if [ "$SALOME_USE_64BIT_IDS" == "1" ]; then echo "WARNING: user requested VTK 64 bits encoding..." CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=ON" else diff --git a/products/compil_scripts/ParaView-5.8.0.sh b/products/compil_scripts/ParaView-5.8.0.sh index 4577725..2f82294 100755 --- a/products/compil_scripts/ParaView-5.8.0.sh +++ b/products/compil_scripts/ParaView-5.8.0.sh @@ -68,8 +68,7 @@ else fi ### VTK general settings -if [ -n "$SALOME_USE_64BIT_IDS" ] -then +if [ "$SALOME_USE_64BIT_IDS" == "1" ]; then echo "WARNING: user requested VTK 64 bits encoding..." CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_USE_64BIT_IDS:BOOL=ON" else diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh index a935d83..eaf6ff0 100755 --- a/products/compil_scripts/ParaView-5.9.0.sh +++ b/products/compil_scripts/ParaView-5.9.0.sh @@ -73,8 +73,7 @@ else fi ### VTK general settings -if [ -n "$SALOME_USE_64BIT_IDS" ] -then +if [ "$SALOME_USE_64BIT_IDS" == "1" ]; then echo "WARNING: user requested VTK 64 bits encoding..." CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=ON" else diff --git a/products/compil_scripts/med-4.1.1.sh b/products/compil_scripts/med-4.1.1.sh index 80e4f96..0a0124b 100755 --- a/products/compil_scripts/med-4.1.1.sh +++ b/products/compil_scripts/med-4.1.1.sh @@ -18,8 +18,7 @@ else export F77=gfortran fi -if [ -n "$SALOME_USE_64BIT_IDS" ] -then +if [ "$SALOME_USE_64BIT_IDS" == "1" ]; then echo "WARNING: user requested 64 bits encoding for integers..." export FFLAGS="-g -O2 -ffixed-line-length-none -fdefault-integer-8" export FCFLAGS="-fdefault-integer-8" diff --git a/products/compil_scripts/med.sh b/products/compil_scripts/med.sh index 886fa7e..812b5a1 100755 --- a/products/compil_scripts/med.sh +++ b/products/compil_scripts/med.sh @@ -30,8 +30,7 @@ else export F77=gfortran fi -if [ -n "$SALOME_USE_64BIT_IDS" ] -then +if [ "$SALOME_USE_64BIT_IDS" == "1" ]; then echo "WARNING: user requested 64 bits encoding for integers..." export FFLAGS=-fdefault-integer-8 export FFLAGS=$FFLAGS' -g -O2 -ffixed-line-length-none' -- 2.39.2