From b6e80a67c9afe321cb3a17a09ef9f40426fac61d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 27 Sep 2022 22:28:55 +1000 Subject: Build: temporarily disable wayland dependency This caused problems on centos7, see D16074 for details. --- build_files/build_environment/CMakeLists.txt | 3 ++- build_files/build_environment/cmake/harvest.cmake | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'build_files') 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") -- cgit v1.2.3