[Bf-blender-cvs] [0db53a579d3] wl_default: cmake: use extern 'wayland-protocols' if system version is insufficient

Christian Rauch noreply at git.blender.org
Thu Jul 1 23:49:56 CEST 2021


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

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..bbc064ba1e6 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 wayland-protocols>=1.15)
+    if (wayland-protocols_FOUND)
+      pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+    else()
+      set(WAYLAND_PROTOCOLS_DIR ${CMAKE_SOURCE_DIR}"/extern/wayland-protocols")
+    endif()
 
     # Generate protocols bindings.
     macro(generate_protocol_bindings NAME PROT_DEF)



More information about the Bf-blender-cvs mailing list