[Bf-blender-cvs] [b2ab9977bf3] master: Deps: use the locally built wayland-scanner for wayland_protocols

[Campbell Barton]

Commit: b2ab9977bf3b3e109ac976045635d84b9ae7f3c6
Author: Campbell Barton
Date:   Fri Oct 14 18:59:11 2022 +1100
Branches: master
https://developer.blender.org/rBb2ab9977bf3b3e109ac976045635d84b9ae7f3c6

Deps: use the locally built wayland-scanner for wayland_protocols

This removes the dependency on wayland-devel, with some potential
for errors caused from using two different versions.

Note that the generated files are currently unchanged.

===================================================================

M	build_files/build_environment/cmake/wayland_protocols.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/wayland_protocols.cmake b/build_files/build_environment/cmake/wayland_protocols.cmake
index 23d29b49260..9bdbc38fd6c 100644
--- a/build_files/build_environment/cmake/wayland_protocols.cmake
+++ b/build_files/build_environment/cmake/wayland_protocols.cmake
@@ -5,7 +5,14 @@ ExternalProject_Add(external_wayland_protocols
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
   PREFIX ${BUILD_DIR}/wayland-protocols
-  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
+  # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own WAYLAND.
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH
+                    meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
+
+add_dependencies(
+  external_wayland_protocols
+  external_wayland
+)