Commit: 356d3354a085418bbd4681d5ea0b08d55072de67 Author: Christian Rauch Date: Wed Jun 23 21:43:04 2021 +0100 Branches: wl_default6 https://developer.blender.org/rB356d3354a085418bbd4681d5ea0b08d55072de67
cmake: use harvested 'wayland-protocols' if system version is insufficient =================================================================== M intern/ghost/CMakeLists.txt =================================================================== diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 77ec307e604..09c82139290 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -294,7 +294,20 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) ) pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) + + 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 DEFINED WAYLAND_PROTOCOLS_DIR) + message(FATAL_ERROR "path to wayland-protocols not found") + endif() # Generate protocols bindings. macro(generate_protocol_bindings NAME PROT_DEF) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs