From 7f3186ef7bef208543f09fd1b2b6fef97d070a69 Mon Sep 17 00:00:00 2001
From: Allen Winter <allen.winter@kdab.com>
Date: Sat, 6 Feb 2021 08:45:33 -0500
Subject: scripts/buildtests.sh - improve CMake version calculation

---
 scripts/buildtests.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'scripts')

diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh
index 3167779a..dff3bcdb 100755
--- a/scripts/buildtests.sh
+++ b/scripts/buildtests.sh
@@ -528,6 +528,18 @@ then
   # read the min required CMake version from the top-level CMake file
   minCMakeVers=`grep -i cmake_minimum_required $TOP/CMakeLists.txt | grep VERSION | sed 's/^.*VERSION\s*//i' | cut -d. -f1-2 | sed 's/\s*).*$//'`
   # adjust PATH
+  X=`echo $minCMakeVers | cut -d. -f1`
+  Y=`echo $minCMakeVers | cut -d. -f2`
+  if ( test -z $X -o -z $Y )
+  then
+    echo "Bad CMake version encountered in the $TOP/CMakeLists.txt"
+    exit 1
+  fi
+  Z=`echo $minCMakeVers | cut -d. -f3`
+  if ( test -z $Z )
+  then
+    minCMakeVers="$minCMakeVers.0"
+  fi
   export PATH=/usr/local/opt/cmake-$minCMakeVers/bin:$PATH
   # check the version
   if ( test `cmake --version | head -1 | grep -c $minCMakeVers` -ne 1 )
-- 
cgit v1.2.1