diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-27 15:28:55 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-10-03 15:59:15 +0300 |
| commit | b6e80a67c9afe321cb3a17a09ef9f40426fac61d (patch) | |
| tree | e44824eb1456ca5742aa64aa296d7639e7dcb570 /build_files | |
| parent | 227d8f4651a4c54b154362e2ee15100b9cf372e6 (diff) | |
Build: temporarily disable wayland dependency
This caused problems on centos7, see D16074 for details.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
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") |