From 7fbf72f148dc9eada86cfcb345310c98f76962b8 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 29 Aug 2022 18:59:46 +0200 Subject: Build: automatically disable WITH_GHOST_WAYLAND if missing libraries Same as other build options, don't make it a hard requirement to have Wayland libraries installed when it gets enabled by default. Also fixes wayland-protocols not being found on the buildbot. --- intern/ghost/CMakeLists.txt | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'intern/ghost') diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index f6851b67681..f2e6609a263 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -303,22 +303,6 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) intern/GHOST_WaylandUtils.h ) - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) - - pkg_check_modules(wayland-protocols wayland-protocols>=1.15) - if(${wayland-protocols_FOUND}) - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) - else() - find_path(WAYLAND_PROTOCOLS_DIR - NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml - PATH_SUFFIXES share/wayland-protocols - ) - endif() - - if(NOT EXISTS ${WAYLAND_PROTOCOLS_DIR}) - message(FATAL_ERROR "path to wayland-protocols not found") - endif() - set(INC_DST ${CMAKE_CURRENT_BINARY_DIR}/libwayland) # Generate protocols bindings. -- cgit v1.2.3