Skip to content

Commit 779b52a

Browse files
rhabackerrpavlik
authored andcommitted
Fix finding wayland-client.h on Linux
1 parent ff3325c commit 779b52a

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
loader,api_layers: Fix finding wayland-client.h on linux

src/api_layers/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ if(Vulkan_FOUND)
104104
PRIVATE ${Vulkan_INCLUDE_DIRS}
105105
)
106106
endif()
107+
if(BUILD_WITH_WAYLAND_HEADERS)
108+
target_include_directories(XrApiLayer_api_dump
109+
PRIVATE ${WAYLAND_CLIENT_INCLUDE_DIRS})
110+
endif()
107111

108112
# Basics for core_validation API Layer
109113

@@ -168,6 +172,10 @@ if(Vulkan_FOUND)
168172
PRIVATE ${Vulkan_INCLUDE_DIRS}
169173
)
170174
endif()
175+
if(BUILD_WITH_WAYLAND_HEADERS)
176+
target_include_directories(XrApiLayer_core_validation
177+
PRIVATE ${WAYLAND_CLIENT_INCLUDE_DIRS})
178+
endif()
171179

172180
if(WIN32)
173181
# Windows api_dump-specific information

src/cmake/presentation.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ elseif(PRESENTATION_BACKEND MATCHES "wayland")
132132
${WAYLAND_PROTOCOLS_DIR}/${PROTOCOL}.h
133133
)
134134

135-
target_include_directories(openxr-gfxwrapper PUBLIC ${WAYLAND_PROTOCOLS_DIR})
135+
target_include_directories(openxr-gfxwrapper PUBLIC ${WAYLAND_PROTOCOLS_DIR} ${WAYLAND_CLIENT_INCLUDE_DIRS})
136136
target_link_libraries(
137137
openxr-gfxwrapper PRIVATE ${EGL_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES}
138138
)

src/loader/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ else()
9090
target_compile_options(openxr_loader PRIVATE -Wno-unused-parameter)
9191
endif()
9292
endif()
93+
if(BUILD_WITH_WAYLAND_HEADERS)
94+
target_include_directories(openxr_loader PRIVATE ${WAYLAND_CLIENT_INCLUDE_DIRS})
95+
endif()
96+
9397
set_target_properties(openxr_loader PROPERTIES FOLDER ${LOADER_FOLDER})
9498

9599
if(LOADER_EXTERNAL_GEN_DEPENDS)

0 commit comments

Comments
 (0)