From 978bc129a0c7c2edf82faeffc4b9e2872789aa26 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Mon, 15 May 2023 13:01:16 +0000 Subject: [PATCH] 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 Commit-Queue: Corentin Wallez Kokoro: Kokoro --- third_party/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 77d8129a37..bd1b699463 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -78,6 +78,8 @@ if (NOT TARGET glfw AND DAWN_SUPPORTS_GLFW_FOR_WINDOWING) 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")