From f8a6f8b1684067484194b1ff3dfda351e671ce7b Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 13 Oct 2021 16:22:32 -0500 Subject: [PATCH] CMake: link to Xlib with Qt6 This is required for src/util/screensaver.cpp. --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f54ae9bc5e47..e4221a6e2571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2191,11 +2191,16 @@ if(APPLE) ) endif() elseif(UNIX AND NOT APPLE) - if(NOT QT6) + if(QT6) + find_package(X11) + else() find_package(X11 REQUIRED) find_package(Qt5 COMPONENTS X11Extras REQUIRED) + target_link_libraries(mixxx-lib PRIVATE Qt5::X11Extras) + endif() + if(${X11_FOUND}) target_include_directories(mixxx-lib SYSTEM PUBLIC "${X11_INCLUDE_DIR}") - target_link_libraries(mixxx-lib PRIVATE "${X11_LIBRARIES}" Qt5::X11Extras) + target_link_libraries(mixxx-lib PRIVATE "${X11_LIBRARIES}") endif() find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED) target_link_libraries(mixxx-lib PRIVATE