From f9092483d2c0bd962b86e25de7bdd9b7d04bd867 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz <wallbraker@gmail.com> Date: Mon, 28 Mar 2022 09:36:02 +0000 Subject: [PATCH] getting-started: Prefer CMake over meson in examples --- getting-started.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/getting-started.md b/getting-started.md index fb75f49..692f942 100644 --- a/getting-started.md +++ b/getting-started.md @@ -71,22 +71,21 @@ Other useful packages: ### Installation from Source -Install the meson and ninja build tools +Install the CMake and ninja build tools - apt install meson ninja-build + apt install cmake ninja-build See [https://gitlab.freedesktop.org/monado/monado#getting-started](https://gitlab.freedesktop.org/monado/monado#getting-started) for a list of dependencies. This command will install required and some optional dependencies that will enable most of the commonly used functionality of monado on Debian/Ubuntu. Some features and drivers are only compiled with additional dependencies like libsurvive or librealsense. - apt install build-essential git wget unzip cmake meson ninja-build libeigen3-dev curl patch python3 pkg-config libx11-dev libx11-xcb-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libvulkan-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libudev-dev libhidapi-dev libwayland-dev libuvc-dev libavcodec-dev libopencv-dev libv4l-dev libcjson-dev libsdl2-dev libegl1-mesa-dev + apt install build-essential git wget unzip cmake ninja-build libeigen3-dev curl patch python3 pkg-config libx11-dev libx11-xcb-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libvulkan-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libudev-dev libhidapi-dev libwayland-dev libuvc-dev libavcodec-dev libopencv-dev libv4l-dev libcjson-dev libsdl2-dev libegl1-mesa-dev then compile and install Monado. Monado can be built with either cmake or meson. git clone https://gitlab.freedesktop.org/monado/monado.git - cd monado - meson --prefix=/usr build + cmake -G Ninja -S monado -B build -DCMAKE_INSTALL_PREFIX=/usr ninja -C build install ## Running OpenXR Applications @@ -117,7 +116,7 @@ Build the OpenXR SDK with cmake, this example uses ninja. Since version 0.2, Monado can be built in two different modes: With `monado-service` (this is the default) and without `monado-service`. -The service can be disabled with `meson -Dservice=false` or `cmake -DXRT_FEATURE_SERVICE=OFF`. +The service can be disabled with `cmake -DXRT_FEATURE_SERVICE=OFF` or `meson -Dservice=false`. #### With `monado-service` {: #service} -- GitLab