From 254c5fc75225ef970ae1786dc17a129ab33c844e Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 22 Feb 2023 11:01:04 +0100 Subject: [PATCH] Switch to "meson setup" Fixes this warning: WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated. --- .builds/alpine.yml | 2 +- .builds/archlinux.yml | 4 ++-- .builds/freebsd.yml | 2 +- README.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 6df07fab..a2c90953 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -24,7 +24,7 @@ sources: tasks: - setup: | cd wlroots - meson build --fatal-meson-warnings --default-library=both -Dauto_features=enabled -Dxcb-errors=disabled + meson setup build --fatal-meson-warnings --default-library=both -Dauto_features=enabled -Dxcb-errors=disabled - build: | cd wlroots ninja -C build diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 16d89331..f311bf74 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -25,8 +25,8 @@ sources: tasks: - setup: | cd wlroots - CC=gcc meson build-gcc --fatal-meson-warnings --default-library=both -Dauto_features=enabled --prefix /usr -Db_sanitize=address,undefined - CC=clang meson build-clang --fatal-meson-warnings -Dauto_features=enabled + CC=gcc meson setup build-gcc --fatal-meson-warnings --default-library=both -Dauto_features=enabled --prefix /usr -Db_sanitize=address,undefined + CC=clang meson setup build-clang --fatal-meson-warnings -Dauto_features=enabled - gcc: | cd wlroots/build-gcc ninja diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 872e01fe..743dfb49 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -32,7 +32,7 @@ sources: tasks: - wlroots: | cd wlroots - meson build --fatal-meson-warnings -Dauto_features=enabled + meson setup build --fatal-meson-warnings -Dauto_features=enabled ninja -C build sudo ninja -C build install - tinywl: | diff --git a/README.md b/README.md index e269ff14..da2cbc92 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ If you choose to enable X11 support: Run these commands: - meson build/ + meson setup build/ ninja -C build/ Install like so: