diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,11 @@ set(FAQS "https://github.com/psifidotos/Latte-Dock/wiki/F.A.Q.") set(QT_MIN_VERSION "5.7.0") -set(KF5_MIN_VERSION "5.33.0") +set(KF5_MIN_VERSION "5.38.0") set(KF5_LOCALE_PREFIX "") -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM ${KF5_MIN_VER} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick) @@ -44,6 +44,16 @@ set(HAVE_X11 ON) endif() +include(ECMQMLModules) +ecm_find_qmlmodule(QtQuick 2.7) +ecm_find_qmlmodule(QtQuick.Layouts 1.3) +ecm_find_qmlmodule(QtQuick.Controls 1.4) +ecm_find_qmlmodule(QtQuick.Controls.Styles.Plasma 2.0) +ecm_find_qmlmodule(QtGraphicalEffects 1.0) +ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) +ecm_find_qmlmodule(org.kde.plasma.core 2.0) +ecm_find_qmlmodule(org.kde.plasma.components 2.0) + include(CheckIncludeFiles) include(CMakePackageConfigHelpers) include(ECMOptionalAddSubdirectory) diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -26,25 +26,25 @@ Qt5Gui >= 5.7.0 Qt5Dbus >= 5.7.0 - KF5Plasma >= 5.33.0 - KF5PlasmaQuick >= 5.33.0 - KF5Activities >= 5.33.0 - KF5CoreAddons >= 5.39.0 - KF5DBusAddons >= 5.33.0 - KF5Declarative >= 5.33.0 - KF5Wayland >= 5.33.0 - KF5Package >= 5.33.0 - KF5XmlGui >= 5.33.0 - KF5IconThemes >= 5.33.0 - KF5I18n >= 5.33.0 - KF5Notifications >= 5.33.0 - KF5NewStuff >= 5.33.0 - KF5Archive >= 5.339.0 - KF5GlobalAccel >= 5.33.0 - KF5Crash >= 5.33.0 + KF5Plasma >= 5.38.0 + KF5PlasmaQuick >= 5.38.0 + KF5Activities >= 5.38.0 + KF5CoreAddons >= 5.38.0 + KF5DBusAddons >= 5.38.0 + KF5Declarative >= 5.38.0 + KF5Wayland >= 5.38.0 + KF5Package >= 5.38.0 + KF5XmlGui >= 5.38.0 + KF5IconThemes >= 5.38.0 + KF5I18n >= 5.38.0 + KF5Notifications >= 5.38.0 + KF5NewStuff >= 5.38.0 + KF5Archive >= 5.38.0 + KF5GlobalAccel >= 5.38.0 + KF5Crash >= 5.38.0 For X11 support: - KF5WindowSystem >= 5.33.0 + KF5WindowSystem >= 5.38.0 Qt5X11Extras >= 5.7.0 libxcb libSM