Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: Fix CMake binary dir when built as subdir

Browse Source 
Regression introduced by 2747e47393.

Related to #1782.
This commit is contained in:
Joel Winarske 2020-10-08 14:58:06 -07:00 committed by Camilla Löwy
parent 0bccc3852b
commit af8f9713dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -66,22 +66,22 @@ if (_GLFW_WAYLAND)
set(GLFW_WAYLAND_PROTOCOL_SOURCES) set(GLFW_WAYLAND_PROTOCOL_SOURCES)
wayland_generate( wayland_generate(
${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml ${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_generate(
${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ${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_generate(
${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml ${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_generate(
${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${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_generate(
${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${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_generate(
${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml ${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}) target_sources(glfw PRIVATE ${GLFW_WAYLAND_PROTOCOL_SOURCES})
endif() endif()