From a5566aab63ec8dbfb2af99bbfd9b283867748c2a Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 4 Nov 2022 15:43:07 +0100
Subject: [PATCH] Fix openMP default in config scripts, refs #2622
---
cmake/scripts/config.csh.in | 1 -
cmake/scripts/config.sh.in | 2 +-
cmake/scripts/root_macro.sh.in | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cmake/scripts/config.csh.in b/cmake/scripts/config.csh.in
index 86da852bd4..6d0b1f7aab 100644
--- a/cmake/scripts/config.csh.in
+++ b/cmake/scripts/config.csh.in
@@ -30,7 +30,6 @@ if ( "$same_system" == "1" ) then
setenv VMCWORKDIR "@VMCWORKDIR@"
setenv FAIRLIBDIR "@FAIRLIBDIR@"
setenv PYTHONPATH "@MY_PYTHONPATH@"
- setenv OMP_NUM_THREADS @OMP_NUM_THREADS@
if (! $?OMP_NUM_THREADS) then
setenv OMP_NUM_THREADS @OMP_NUM_THREADS@
else
diff --git a/cmake/scripts/config.sh.in b/cmake/scripts/config.sh.in
index 0097d168f2..4b939d17ad 100644
--- a/cmake/scripts/config.sh.in
+++ b/cmake/scripts/config.sh.in
@@ -29,7 +29,7 @@ if [ $same_system -eq 1 ]; then
export VMCWORKDIR="@VMCWORKDIR@"
export FAIRLIBDIR="@FAIRLIBDIR@"
export PYTHONPATH="@MY_PYTHONPATH@"
- if [[ -z "${OMP_NUM_THREADS}" ]]; then
+ if [[ -z $OMP_NUM_THREADS ]]; then
export OMP_NUM_THREADS=@OMP_NUM_THREADS@
fi
diff --git a/cmake/scripts/root_macro.sh.in b/cmake/scripts/root_macro.sh.in
index 9082e424c6..f22d220bc8 100644
--- a/cmake/scripts/root_macro.sh.in
+++ b/cmake/scripts/root_macro.sh.in
@@ -19,7 +19,7 @@ export VMCWORKDIR=@VMCWORKDIR@
export Geant4VMC_MACRO_DIR=@Geant4VMC_MACRO_DIR@
export USE_VGM=1
export BOOST=@Boost_Avail@
-if [[ -z "${OMP_NUM_THREADS}" ]]; then
+if [[ -z $OMP_NUM_THREADS ]]; then
export OMP_NUM_THREADS=@OMP_NUM_THREADS@
fi
--
GitLab