diff options
| author | Juan Ramos <juan@lunarg.com> | 2022-12-27 12:05:40 -0700 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2022-12-27 13:30:48 -0700 |
| commit | 99cce136a531ebfd5ecd6199b36d92d15c19f9e6 (patch) | |
| tree | 2ad6740315a5eaa260c1f3338caced9a0a8ebd86 /cube | |
| parent | dda9ae0f9113ad3816ba5f84e1a59b1529e82630 (diff) | |
| download | usermoji-99cce136a531ebfd5ecd6199b36d92d15c19f9e6.tar.xz | |
cmake: Use PkgConfig to find XCB
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 9db7d5ba..e7a1db2e 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -49,15 +49,16 @@ else() endif() if(UNIX AND NOT APPLE) # i.e. Linux - find_package(PkgConfig) option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON) option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF) set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DIRECTFB, DISPLAY)") + find_package(PkgConfig REQUIRED QUIET) # Use PkgConfig to find Linux system libraries + if(BUILD_WSI_XCB_SUPPORT) - find_package(XCB REQUIRED) + pkg_check_modules(XCB REQUIRED QUIET IMPORTED_TARGET xcb) endif() if(BUILD_WSI_XLIB_SUPPORT) @@ -134,8 +135,7 @@ elseif(UNIX AND NOT APPLE) # i.e. Linux if(NOT BUILD_WSI_XCB_SUPPORT) message(FATAL_ERROR "Selected XCB for vkcube build but not building Xcb support") endif() - set(CUBE_INCLUDE_DIRS ${XCB_INCLUDE_DIRS} ${CUBE_INCLUDE_DIRS}) - link_libraries(${XCB_LIBRARIES}) + link_libraries(PkgConfig::XCB) set(CUBE_PLATFORM VK_USE_PLATFORM_XCB_KHR) elseif(CUBE_WSI_SELECTION STREQUAL "XLIB") if(NOT BUILD_WSI_XLIB_SUPPORT) |