diff options
| author | Juan Ramos <juan@lunarg.com> | 2022-12-27 12:08:43 -0700 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2022-12-27 13:30:48 -0700 |
| commit | bc40543f2c4658918498f1ef415650ccf8ccaa01 (patch) | |
| tree | 0a62ffea6d3988aa3de6cd7977c9187496cedc9b | |
| parent | 99cce136a531ebfd5ecd6199b36d92d15c19f9e6 (diff) | |
| download | usermoji-bc40543f2c4658918498f1ef415650ccf8ccaa01.tar.xz | |
cmake: Use PkgConfig to find X11
| -rw-r--r-- | cube/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | vulkaninfo/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index e7a1db2e..e96b359a 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -62,7 +62,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux endif() if(BUILD_WSI_XLIB_SUPPORT) - find_package(X11 REQUIRED) + pkg_check_modules(X11 REQUIRED QUIET IMPORTED_TARGET x11) endif() if(BUILD_WSI_WAYLAND_SUPPORT) @@ -141,8 +141,7 @@ elseif(UNIX AND NOT APPLE) # i.e. Linux if(NOT BUILD_WSI_XLIB_SUPPORT) message(FATAL_ERROR "Selected XLIB for vkcube build but not building Xlib support") endif() - set(CUBE_INCLUDE_DIRS ${X11_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS}) - link_libraries(${X11_LIBRARIES}) + link_libraries(PkgConfig::X11) set(CUBE_PLATFORM VK_USE_PLATFORM_XLIB_KHR) elseif(CUBE_WSI_SELECTION STREQUAL "WAYLAND") if(NOT BUILD_WSI_WAYLAND_SUPPORT) diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt index d91dd79e..70e2da4e 100644 --- a/vulkaninfo/CMakeLists.txt +++ b/vulkaninfo/CMakeLists.txt @@ -75,9 +75,8 @@ if(UNIX AND NOT APPLE) # i.e. Linux endif() if(BUILD_WSI_XLIB_SUPPORT) - find_package(X11 REQUIRED) - target_include_directories(vulkaninfo PRIVATE ${X11_INCLUDE_DIR}) - target_link_libraries(vulkaninfo ${X11_LIBRARIES}) + pkg_check_modules(X11 REQUIRED QUIET IMPORTED_TARGET x11) + target_link_libraries(vulkaninfo PkgConfig::X11) target_compile_definitions(vulkaninfo PRIVATE -DVK_USE_PLATFORM_XLIB_KHR -DVK_NO_PROTOTYPES) endif() |