Commit: b486c438113237529d2040315c66139a704ec2ba
Author: Christian Rauch
Date: Wed Jun 23 21:43:04 2021 +0100
Branches: wl_default
https://developer.blender.org/rBb486c438113237529d2040315c66139a704ec2ba
cmake: use extern '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..4fc36103c39 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -294,7 +294,13 @@ 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 REQUIRED wayland-protocols>=1.15)
+ if (wayland-protocols_FOUND)
+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+ else()
+ set(WAYLAND_PROTOCOLS_DIR STRING
${CMAKE_SOURCE_DIR}"/extern/wayland-protocols")
+ 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
