Skip to content
Snippets Groups Projects
Commit fd453cb5 authored by Dmitri Konstantinov's avatar Dmitri Konstantinov
Browse files

Merge branch 'fix-grep' into 'master'

Use extended regexp in grep where [0-9]+ used in create_lcg_view_setup_sh.in...

See merge request !2743
parents 9a363328 9207e588
No related branches found
No related tags found
1 merge request!2743Use extended regexp in grep where [0-9]+ used in create_lcg_view_setup_sh.in...
Pipeline #10022777 passed
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment