From 8d38d21cacf32acc9001d8b78ed1b65560622229 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Wed, 1 Oct 2025 18:39:36 -0700 Subject: [PATCH] Try new cmake style for Qt6 --- qt6/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt index bff3a03..c24f3d7 100644 --- a/qt6/CMakeLists.txt +++ b/qt6/CMakeLists.txt @@ -1,10 +1,10 @@ -find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets) -find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private) +set(QT6_REQUIRED_COMPONENTS Core Gui GuiPrivate DBus Widgets) + if (ENABLE_QT6_WAYLAND_WORKAROUND) - find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private) - find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED) + list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandClientPrivate WaylandGlobalPrivate) endif() +find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED COMPONENTS ${QT6_REQUIRED_COMPONENTS}) add_subdirectory(dbusaddons) add_subdirectory(platforminputcontext)