diff options
| author | Philipp Kerling <pkerling@casix.org> | 2018-01-16 10:05:09 +0100 |
|---|---|---|
| committer | Philipp Kerling <pkerling@casix.org> | 2018-01-16 10:05:09 +0100 |
| commit | 2292165445877e56ba70d3607510662b18f62d6d (patch) | |
| tree | 122f243b48b1d79ce636ad751ee37117fd804c90 | |
| parent | 18f76abae65a3707868548b6f988eef762f9c49c (diff) | |
[wayland] Use xdg-shell.xml from waylandpp
Ubuntu 17.10 does not have recent enough wayland-protocols for building
with xdg-shell stable. To avoid having to package it or adding ifdefs
to support building with older wayland-protocols, use xdg-shell.xml
from waylandpp.
| -rw-r--r-- | cmake/scripts/linux/ExtraTargets.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake index 095a034ba2..37d196af1a 100644 --- a/cmake/scripts/linux/ExtraTargets.cmake +++ b/cmake/scripts/linux/ExtraTargets.cmake @@ -18,7 +18,7 @@ if(CORE_PLATFORM_NAME_LC STREQUAL "wayland") # This cannot go into wayland.cmake since it requires the Wayland dependencies # to already be resolved set(PROTOCOL_XMLS "${WAYLANDPP_PROTOCOLS_DIR}/presentation-time.xml" - "${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml" + "${WAYLANDPP_PROTOCOLS_DIR}/xdg-shell.xml" "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-shell/xdg-shell-unstable-v6.xml" "${WAYLAND_PROTOCOLS_DIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml") add_custom_command(OUTPUT "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.hpp" "${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}/wayland-extra-protocols.cpp" @@ -28,4 +28,4 @@ if(CORE_PLATFORM_NAME_LC STREQUAL "wayland") # Dummy target for dependencies add_custom_target(generate-wayland-extra-protocols DEPENDS wayland-extra-protocols.hpp) -endif()
\ No newline at end of file +endif() |