From 9207e588a36330541b2e93babc84d31bce5a29cb Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <Dmitri.Konstantinov@cern.ch>
Date: Wed, 29 Jan 2025 09:47:13 +0100
Subject: [PATCH] Use extended regexp in grep where [0-9]+ used in
create_lcg_view_setup_sh.in and create_lcg_view_setup_csh.in
---
cmake/scripts/create_lcg_view_setup_csh.in | 2 +-
cmake/scripts/create_lcg_view_setup_sh.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/scripts/create_lcg_view_setup_csh.in b/cmake/scripts/create_lcg_view_setup_csh.in
index 7fc3dd9365..5ea89ba40f 100644
--- a/cmake/scripts/create_lcg_view_setup_csh.in
+++ b/cmake/scripts/create_lcg_view_setup_csh.in
@@ -96,7 +96,7 @@ endif
if ( -f $thisdir/include/Vc/Vc ) then
set vcdir=`readlink $thisdir/include/Vc/Vc`
set vcdir=`dirname $vcdir`
- set std=`cat $vcdir/../../logs/Vc*configure.cmake | \grep -Eo 'CMAKE_CXX_STANDARD=[0-9]+' | \grep -o '[0-9]+'`
+ set std=`cat $vcdir/../../logs/Vc*configure.cmake | \grep -Eo 'CMAKE_CXX_STANDARD=[0-9]+' | \grep -Eo '[0-9]+'`
setenv CMAKE_CXX_STANDARD ${std}
endif
diff --git a/cmake/scripts/create_lcg_view_setup_sh.in b/cmake/scripts/create_lcg_view_setup_sh.in
index 4087dbcd16..51c671c6e4 100644
--- a/cmake/scripts/create_lcg_view_setup_sh.in
+++ b/cmake/scripts/create_lcg_view_setup_sh.in
@@ -104,7 +104,7 @@ fi
#---Figure out the CMAKE_CXX_STANDARD (using Vc as a victim)
if [ -f $thisdir/include/Vc/Vc ]; then
vc_home=$(dirname $(dirname $(dirname $(readlink $thisdir/include/Vc/Vc))))
- std=$(cat $vc_home/logs/Vc*configure.cmake | \grep -Eo "CMAKE_CXX_STANDARD=[0-9]+" | \grep -o "[0-9]+")
+ std=$(cat $vc_home/logs/Vc*configure.cmake | \grep -Eo "CMAKE_CXX_STANDARD=[0-9]+" | \grep -Eo "[0-9]+")
export CMAKE_CXX_STANDARD=$std
fi
--
GitLab