From 0496ba9c5cc5620c42cccf9a0c4c5292b3c3f736 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Tue, 28 Jun 2022 09:43:12 -0500 Subject: [PATCH] aux/vk: Add additional include dirs conditionally. --- doc/changes/misc_fixes/mr.1396.md | 4 ++++ src/xrt/auxiliary/vk/CMakeLists.txt | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 doc/changes/misc_fixes/mr.1396.md diff --git a/doc/changes/misc_fixes/mr.1396.md b/doc/changes/misc_fixes/mr.1396.md new file mode 100644 index 000000000..182bd2d2a --- /dev/null +++ b/doc/changes/misc_fixes/mr.1396.md @@ -0,0 +1,4 @@ +--- +- issue.175 +--- +Fix build issue with Wayland on some distributions. diff --git a/src/xrt/auxiliary/vk/CMakeLists.txt b/src/xrt/auxiliary/vk/CMakeLists.txt index 8261f000f..6caeaf075 100644 --- a/src/xrt/auxiliary/vk/CMakeLists.txt +++ b/src/xrt/auxiliary/vk/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright 2019-2022, Collabora, Ltd. # SPDX-License-Identifier: BSL-1.0 - add_library( aux_vk STATIC vk_bundle_init.c @@ -28,3 +27,13 @@ if(ANDROID) target_link_libraries(aux_vk PUBLIC aux_android) target_link_libraries(aux_vk PUBLIC ${ANDROID_LIBRARY}) endif() + +if(XRT_HAVE_WAYLAND) + target_include_directories(aux_vk PRIVATE ${WAYLAND_INCLUDE_DIR}) +endif() +if(XRT_HAVE_XCB) + target_include_directories(aux_vk PRIVATE ${XCB_INCLUDE_DIR}) +endif() +if(XRT_HAVE_XRANDR) + target_include_directories(aux_vk PRIVATE ${XRANDR_INCLUDE_DIR} ${X11_INCLUDE_DIR}) +endif()