Commit 5ad0a01e authored by Nicolas Fella's avatar Nicolas Fella Committed by Bhushan Shah

Cleanup cmake files

Set more realistic minimum versions for Qt/KF5
Remove some unneeded dependencies
parent 1a2b6bad
Pipeline #27071 failed with stage
in 10 minutes and 43 seconds
......@@ -14,7 +14,10 @@ include(FeatureSummary)
################# set KDE specific information #################
find_package(ECM 0.0.8 REQUIRED NO_MODULE)
set (QT_MIN_VERSION "5.14.0")
set (KF5_MIN_VERSION "5.70")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
......@@ -26,11 +29,9 @@ include(ECMQMLModules)
################# now find all used packages #################
set (QT_MIN_VERSION "5.4.0")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
find_package(KF5 REQUIRED COMPONENTS
WindowSystem
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
Solid
Config
......@@ -38,7 +39,6 @@ find_package(KF5 REQUIRED COMPONENTS
DBusAddons
I18n
Plasma
PlasmaQuick
Declarative
KIO
KDELibs4Support
......
......@@ -11,6 +11,7 @@ target_link_libraries(kcm_mobile_theme
Qt5::Gui
Qt5::Quick
Qt5::Qml
KF5::ConfigCore
KF5::Plasma
KF5::I18n
KF5::QuickAddons
......
......@@ -34,9 +34,7 @@
#include <QStandardPaths>
#include <KDesktopFile>
#include <Plasma/Theme>
#include <qstandardpaths.h>
#include <KConfigGroup>
#include <QDebug>
......
# These are only needed here, consider porting away from both!
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Gui)
set(plasma-settings_SRCS
main.cpp
settingsapp.cpp
......@@ -13,11 +10,11 @@ add_executable(plasma-settings ${plasma-settings_SRCS})
target_link_libraries(plasma-settings
Qt5::Quick
Qt5::Gui
Qt5::Widgets
KF5::Package
KF5::DBusAddons
KF5::QuickAddons
KF5::I18n
KF5::WindowSystem
KF5::Declarative
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment