From 48ec13a88182956eb7ee166b0c55d12d398c63a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 3 Feb 2016 15:48:13 +0100 Subject: [PATCH] Check for Xwayland as RUNTIME dependency Make distro's life easier by pointing out that kwin_wayland requires Xwayland. --- CMakeLists.txt | 8 ++++++++ cmake/modules/FindXwayland.cmake | 34 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 cmake/modules/FindXwayland.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index b0e245b2b1..159271aebd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,6 +239,14 @@ set_package_properties(Fontconfig PROPERTIES DESCRIPTION "Font access configurat PURPOSE "Needed for KWin's QPA plugin." ) +find_package(Xwayland) +set_package_properties(Xwayland PROPERTIES + URL "http://x.org" + DESCRIPTION "Xwayland X server" + TYPE RUNTIME + PURPOSE "Needed for running kwin_wayland" + ) + ########### configure tests ############### include(CMakeDependentOption) diff --git a/cmake/modules/FindXwayland.cmake b/cmake/modules/FindXwayland.cmake new file mode 100644 index 0000000000..1f52be55db --- /dev/null +++ b/cmake/modules/FindXwayland.cmake @@ -0,0 +1,34 @@ +#============================================================================= +# Copyright 2016 Martin Gräßlin +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= +find_program(Xwayland_EXECUTABLE NAMES Xwayland) +find_package_handle_standard_args(Xwayland + FOUND_VAR + Xwayland_FOUND + REQUIRED_VARS + Xwayland_EXECUTABLE +) +mark_as_advanced(Xwayland_EXECUTABLE)