[Bf-blender-cvs] [ec6490b7382] wl_default: cmake: use harvested 'wayland-protocols' if system version is insufficient

Christian Rauch noreply at git.blender.org
Sat Jul 3 14:29:26 CEST 2021


Commit: ec6490b7382e57b9f22d56771006cfa733753ca5
Author: Christian Rauch
Date:   Wed Jun 23 21:43:04 2021 +0100
Branches: wl_default
https://developer.blender.org/rBec6490b7382e57b9f22d56771006cfa733753ca5

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..a061bb12bb9 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 stable/xdg-shell/xdg-shell.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)



More information about the Bf-blender-cvs mailing list