[Bf-blender-cvs] [41281cc0e76] master: Build: fix missing xml2 build time dependency for wayland

[Campbell Barton]

Commit: 41281cc0e76154c35c8f08b077cdab51863e15c8
Author: Campbell Barton
Date:   Wed Oct 5 08:41:29 2022 +1100
Branches: master
https://developer.blender.org/rB41281cc0e76154c35c8f08b077cdab51863e15c8

Build: fix missing xml2 build time dependency for wayland

Also prepend the existing 'PKG_CONFIG_PATH' instead of overwriting it
as this prevents 'devtoolset-9' libraries being used in the release
environment.

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

M	build_files/build_environment/cmake/wayland.cmake

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

diff --git a/build_files/build_environment/cmake/wayland.cmake b/build_files/build_environment/cmake/wayland.cmake
index b1c1714fd15..29859cc9ba5 100644
--- a/build_files/build_environment/cmake/wayland.cmake
+++ b/build_files/build_environment/cmake/wayland.cmake
@@ -7,7 +7,7 @@ ExternalProject_Add(external_wayland
   PREFIX ${BUILD_DIR}/wayland
   PATCH_COMMAND ${PATCH_CMD} -d ${BUILD_DIR}/wayland/src/external_wayland < ${PATCH_DIR}/wayland.diff
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT.
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:$PKG_CONFIG_PATH
                     meson --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -Dlibraries=false . ../external_wayland
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
@@ -16,4 +16,5 @@ ExternalProject_Add(external_wayland
 add_dependencies(
   external_wayland
   external_expat
+  external_xml2
 )