diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52b1eec..2505cda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,6 +7,9 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) +if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS CorePrivate REQUIRED) +endif() find_package(Dtk${DTK_VERSION_MAJOR}Log REQUIRED) find_package(DBus1 REQUIRED) if(LINUX) @@ -87,6 +90,9 @@ if(LINUX) PkgConfig::QGSettings ) endif() + if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBusPrivate REQUIRED) + endif() else() add_library(${LIB_NAME} SHARED diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c3aa6b2..0aa55e4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,9 @@ add_link_options(-fsanitize=address) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) +if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS CorePrivate REQUIRED) +endif() if(LINUX) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus) @@ -27,6 +30,9 @@ if(LINUX) else() message(FATAL_ERROR "Unsupported Qt version: ${QT_VERSION_MAJOR}") endif() + if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS CorePrivate REQUIRED) + endif() endif() find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Xml) diff --git a/tools/qdbusxml2cpp/CMakeLists.txt b/tools/qdbusxml2cpp/CMakeLists.txt index e47e7f9..0c3aa54 100644 --- a/tools/qdbusxml2cpp/CMakeLists.txt +++ b/tools/qdbusxml2cpp/CMakeLists.txt @@ -4,6 +4,9 @@ set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR}) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus) +if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBusPrivate REQUIRED) +endif() if(${QT_VERSION_MAJOR} EQUAL 6) if (${Qt6DBus_VERSION} VERSION_GREATER_EQUAL 6.10.0)