diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2022-01-31 19:42:24 -0500 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2022-04-08 14:55:21 +0100 |
| commit | 24a0f55c9c84b2625a564fd07d9da75eaac9c60d (patch) | |
| tree | 36d704d98a7605ffae40e025ea3f88fd1cb058d5 /util/ci | |
| parent | f5e54cd39845aeeff50cdbebf625abf3c4a5b92d (diff) | |
| download | minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.tar.gz minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.tar.bz2 minetest-24a0f55c9c84b2625a564fd07d9da75eaac9c60d.zip | |
Use CMake's -B, --build, and --install options
Diffstat (limited to 'util/ci')
| -rwxr-xr-x | util/ci/build.sh | 8 | ||||
| -rwxr-xr-x | util/ci/clang-tidy.sh | 10 |
2 files changed, 6 insertions, 12 deletions
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 \ |