diff options
| author | Florian Klink <[email protected]> | 2024-08-22 13:04:13 +0300 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2024-08-22 13:50:00 +0300 |
| commit | a437e44a6af8e8f42966ffe3a26c1d562fce6b33 (patch) | |
| tree | 644a0ab1602d007b135ae46f89d14a9b6c3a9ca5 | |
| parent | cae937c51bd220d6676c6027d05ea51fc3c821bb (diff) | |
| download | Hyprland-a437e44a6af8e8f42966ffe3a26c1d562fce6b33.tar.gz Hyprland-a437e44a6af8e8f42966ffe3a26c1d562fce6b33.zip | |
CMakeLists: wayland.xml is in wayland-scanner pkgdatadir
See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136
Similar fix as https://github.com/hyprwm/aquamarine/pull/55.
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f26a5c3c..b1373e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ find_package(PkgConfig REQUIRED) pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") -pkg_get_variable(WAYLAND_SERVER_DIR wayland-server pkgdatadir) +pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir) if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) message(STATUS "Configuring Hyprland in Debug with CMake") @@ -259,7 +259,7 @@ function(protocolWayland) OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp COMMAND hyprwayland-scanner --wayland-enums - ${WAYLAND_SERVER_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ + ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) target_sources(Hyprland PRIVATE protocols/wayland.cpp protocols/wayland.hpp) target_sources(generate-protocol-headers |