summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2022-10-05 09:49:46 -0400
committerAllen Winter <allen.winter@kdab.com>2022-10-05 09:49:46 -0400
commitb390988d5fdbbca078fc4d944b5acbf8a43f55a0 (patch)
treecbcf6deb825418ea488bdfce95b4f787b7645bf7
parent55b5fb3b7b7d21d3a95fd7df1bb813558541c5d6 (diff)
parent516b7eb7991183d009c6dc47344a365f709c7e35 (diff)
downloadlibical-git-b390988d5fdbbca078fc4d944b5acbf8a43f55a0.tar.gz
Merge branch '3.0' into issue585
-rwxr-xr-xscripts/buildtests.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh
index c379ddce..22824940 100755
--- a/scripts/buildtests.sh
+++ b/scripts/buildtests.sh
@@ -138,7 +138,12 @@ CONFIGURE() {
mkdir -p $BDIR
cd $BDIR
rm -rf *
- cmake .. $2 || exit 1
+ if ( test `echo $2 | grep -ci Ninja` -gt 0 )
+ then
+ cmake .. $2 || exit 1
+ else
+ cmake -G "Unix Makefiles" .. $2 || exit 1
+ fi
}
#function CLEAN: