commit 978bc129a0c7c2edf82faeffc4b9e2872789aa26
author Corentin Wallez <cwallez@chromium.org> Mon May 15 13:01:16 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 15 13:01:16 2023 +0000
tree c41cfb03a4cc62baed89e740c39306580488c853
parent 0699b4f21d601cb5d98ba4396d43dd3c2b3c7fd0

CMake: Build GLFW with X11/Wayland support to match Dawn

Otherwise on Wayland-only systems, the GLFW CMake files might still be
looking for X11 when DAWN_USE_X11 is off.

Fixed: dawn:1806
Change-Id: I893f5412efeb3cfa48738b224b455b5fc189809d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/132221
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>

third_party/CMakeLists.txt

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 77d8129..bd1b699 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -78,6 +78,8 @@
     set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_X11 ${DAWN_USE_X11} CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_WAYLAND ${DAWN_USE_WAYLAND} CACHE BOOL "" FORCE)
 
     message(STATUS "Dawn: using GLFW at ${DAWN_GLFW_DIR}")
     add_subdirectory(${DAWN_GLFW_DIR} "${CMAKE_CURRENT_BINARY_DIR}/glfw")