From 24a0f55c9c84b2625a564fd07d9da75eaac9c60d Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Mon, 31 Jan 2022 19:42:24 -0500
Subject: Use CMake's -B, --build, and --install options

---
 util/ci/build.sh      |  8 +++-----
 util/ci/clang-tidy.sh | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'util/ci')

diff --git a/util/ci/build.sh b/util/ci/build.sh
index fb2ec945f..435cc11da 100755
--- a/util/ci/build.sh
+++ b/util/ci/build.sh
@@ -1,8 +1,6 @@
 #! /bin/bash -e
 
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Debug \
+cmake -B build -DCMAKE_BUILD_TYPE=Debug \
 	-DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \
-	-DBUILD_SERVER=TRUE ${CMAKE_FLAGS} ..
-make -j$(($(nproc) + 1))
+	-DBUILD_SERVER=TRUE ${CMAKE_FLAGS}
+cmake --build build --parallel $(($(nproc) + 1))
diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh
index 74578eeac..e678cf3b9 100755
--- a/util/ci/clang-tidy.sh
+++ b/util/ci/clang-tidy.sh
@@ -1,15 +1,11 @@
 #! /bin/bash -eu
 
-mkdir -p build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Debug \
+cmake -B build -DCMAKE_BUILD_TYPE=Debug \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	-DRUN_IN_PLACE=TRUE \
 	-DENABLE_{GETTEXT,SOUND}=FALSE \
-	-DBUILD_SERVER=TRUE ..
-make GenerateVersion
-
-cd ..
+	-DBUILD_SERVER=TRUE
+cmake --build build --target GenerateVersion
 
 ./util/ci/run-clang-tidy.py \
 	-clang-tidy-binary=clang-tidy-9 -p build \
-- 
cgit v1.2.3