From 516b7eb7991183d009c6dc47344a365f709c7e35 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 5 Oct 2022 09:47:18 -0400 Subject: scripts/buildtests.sh - ensure cmake "Unix Makefiles" generator If the user has CMAKE_GENERATOR="Ninja" in their environment then we need to override that, for the normal, non-ninja case. --- scripts/buildtests.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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: -- cgit v1.2.1