From b4567f8f4bb0c2c3a888cf63256591aca12d2ac1 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 19 Jul 2019 00:14:16 +0200 Subject: [PATCH 1/1] cmake 3.15 changed its boost detection message --- tools/jenkins/project_description.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index 99302b8bf9..845abf1273 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -1,7 +1,12 @@ #!/usr/bin/env bash get_boost(){ - grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g" + BOOST=$(grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g") + if [ -z "$BOOST" ] + then + BOOST=$(grep -m 1 "Found Boost:" ./consoleText | sed "s/.*-- Found Boost:.*found suitable version \"\([a-zA-Z0-9\.]*\)\",.*/\1/g") + fi + echo $BOOST } get_compiler(){ -- 2.20.1