[Bf-blender-cvs] [f6664217b32] master: Build: temporarily disable wayland dependency

[Campbell Barton]

Commit: f6664217b3214be869afb732d1d5bfc471a88e9a
Author: Campbell Barton
Date:   Tue Sep 27 22:28:55 2022 +1000
Branches: master
https://developer.blender.org/rBf6664217b3214be869afb732d1d5bfc471a88e9a

Build: temporarily disable wayland dependency

This caused problems on centos7, see D16074 for details.

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

M	build_files/build_environment/CMakeLists.txt
M	build_files/build_environment/cmake/harvest.cmake

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

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 468a434b887..f44bb1cbf75 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -171,7 +171,8 @@ if(UNIX AND NOT APPLE)
   include(cmake/mesa.cmake)
   include(cmake/wayland_protocols.cmake)
   # Can be removed when the build-bot upgrades to v1.20.x or newer.
-  include(cmake/wayland.cmake)
+  # DISABLED: (see D16074).
+  # include(cmake/wayland.cmake)
 endif()
 
 include(cmake/harvest.cmake)
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 6c920e651fe..85c823309fb 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -117,7 +117,8 @@ else()
     harvest(xml2/lib xml2/lib "*.a")
 
     harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
-    harvest(wayland/bin wayland/bin "wayland-scanner")
+    # DISABLED: (see D16074).
+    # harvest(wayland/bin wayland/bin "wayland-scanner")
   else()
     harvest(blosc/lib openvdb/lib "*.a")
     harvest(xml2/lib opencollada/lib "*.a")