From 9a0bd26f83a0f4418c17f367c4b04133d01d7d9d Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sat, 14 Mar 2020 21:04:14 +0100 Subject: [PATCH] build.sh: Should not assume that cmake generates a Makefile. use cmake only commands to configure/build. --- build.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 000f124..ae356b0 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,5 @@ #!/bin/bash -mkdir build 2> /dev/null -pushd build > /dev/null - function usage() { echo "Usage: ${0##*/} [ -h|--help ] [ -t|--type Debug|Release|RelWithDebInfo|MinSizeRel ] [ --disable-threads ] [ --force-ansi ]" exit 1 @@ -42,9 +39,7 @@ while true; do shift done -cmake $ARGS .. +cmake -B build $ARGS . if [ ${ONLY_CONFIG} -eq 0 ]; then - make -B + cmake --build build --clean-first --target fi - -popd > /dev/null