From af8f9713dd807968d0cbcca77fb63a210aaa8f65 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Thu, 8 Oct 2020 14:58:06 -0700 Subject: [PATCH] Wayland: Fix CMake binary dir when built as subdir Regression introduced by 2747e47393cbca2d09db56223e735bd94b21e2eb. Related to #1782. --- src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 68b8e9a3..f583d571 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,22 +66,22 @@ if (_GLFW_WAYLAND) set(GLFW_WAYLAND_PROTOCOL_SOURCES) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml - ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-xdg-shell-client-protocol) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml - ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml - ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-viewporter-client-protocol) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml - ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml - ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol) wayland_generate( ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml - ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) + ${GLFW_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol) target_sources(glfw PRIVATE ${GLFW_WAYLAND_PROTOCOL_SOURCES}) endif()