[Bf-blender-cvs] [933eddc9a11] master: cmake: use harvested 'wayland-protocols' if system version is insufficient
Christian Rauch
noreply at git.blender.org
Tue Jul 6 19:28:33 CEST 2021
Commit: 933eddc9a113b40849895922f2dc350305809ebd
Author: Christian Rauch
Date: Wed Jun 23 21:43:04 2021 +0100
Branches: master
https://developer.blender.org/rB933eddc9a113b40849895922f2dc350305809ebd
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 e98faf522e6..6edd7b386da 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -297,7 +297,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 EXISTS ${WAYLAND_PROTOCOLS_DIR})
+ message(FATAL_ERROR "path to wayland-protocols not found")
+ endif()
# Generate protocols bindings.
macro(generate_protocol_bindings NAME PROT_DEF)
More information about the Bf-blender-cvs
mailing list