Cleanup used Qt & KF libraries a bit

parent 8dd20048
......@@ -24,14 +24,27 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
DBus
Network
Quick
QuickWidgets
UiTools
Widgets
)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
I18n WindowSystem Service Completion WidgetsAddons KIO CoreAddons Wallet ItemViews XmlGui
ConfigWidgets IconThemes Solid DBusAddons Notifications Plasma Declarative Init KDELibs4Support)
I18n
WindowSystem
Service
Completion
WidgetsAddons
KIO
CoreAddons
Wallet
ConfigWidgets
IconThemes
Solid
DBusAddons
Notifications
Plasma
Declarative
KDELibs4Support
)
find_package(KF5NetworkManagerQt REQUIRED 5.42.0)
......
......@@ -17,16 +17,10 @@ add_library(kcm_networkmanagement MODULE ${kcm_networkmanagement_PART_SRCS})
target_link_libraries(kcm_networkmanagement
plasmanm_internal
plasmanm_editor
Qt5::DBus
Qt5::Quick
Qt5::QuickWidgets
Qt5::UiTools
KF5::Completion
KF5::ConfigWidgets
KF5::Declarative
KF5::I18n
KF5::NetworkManagerQt
KF5::WindowSystem
KF5::Service
)
install(TARGETS kcm_networkmanagement DESTINATION ${PLUGIN_INSTALL_DIR} )
......
......@@ -42,21 +42,15 @@ kcoreaddons_desktop_to_json(kded_networkmanagement networkmanagement.desktop)
target_link_libraries(kded_networkmanagement
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Solid
KF5::Completion
KF5::ConfigCore
KF5::I18n
KF5::WidgetsAddons
KF5::DBusAddons
KF5::Notifications
KF5::IconThemes
KF5::Wallet
KF5::WindowSystem
KF5::KIOWidgets
KF5::CoreAddons
)
if (WITH_MODEMMANAGER_SUPPORT)
......
......@@ -18,20 +18,20 @@ set(plasmanm_internal_SRCS
add_library(plasmanm_internal SHARED ${plasmanm_internal_SRCS})
target_link_libraries(plasmanm_internal
plasmanm_editor
PUBLIC
KF5::NetworkManagerQt
KF5::Solid
KF5::Completion
plasmanm_editor
PRIVATE
KF5::Service
KF5::I18n
KF5::IconThemes
KF5::Plasma
KF5::Notifications
Qt5::Xml
Qt5::Network
KF5::Wallet
KF5::WindowSystem
)
if (WITH_MODEMMANAGER_SUPPORT)
target_link_libraries(plasmanm_internal KF5::ModemManagerQt)
target_link_libraries(plasmanm_internal PUBLIC KF5::ModemManagerQt)
endif()
install(TARGETS plasmanm_internal ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -15,11 +15,7 @@ target_link_libraries(plasmanm_qmlplugins
plasmanm_internal
plasmanm_editor
Qt5::Quick
Qt5::DBus
Qt5::Network
KF5::NetworkManagerQt
KF5::I18n
KF5::WindowSystem
)
if (WITH_MODEMMANAGER_SUPPORT)
......
......@@ -84,30 +84,26 @@ ki18n_wrap_ui(plasmanm_editor_SRCS
add_library(plasmanm_editor SHARED ${plasmanm_editor_SRCS})
target_link_libraries(plasmanm_editor
PUBLIC
KF5::NetworkManagerQt
KF5::WidgetsAddons
KF5::Completion
Qt5::Widgets
PRIVATE
Qt5::Network
Qt5::DBus
qca-qt5
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOCore
KF5::KIOWidgets
KF5::CoreAddons
KF5::Wallet
KF5::ItemViews
KF5::XmlGui
KF5::IconThemes
KF5::Notifications
KF5::Wallet
KF5::Solid
KF5::KDELibs4Support
KF5::KDELibs4Support # KLocale
)
if (WITH_MODEMMANAGER_SUPPORT)
target_link_libraries(plasmanm_editor KF5::ModemManagerQt)
target_link_libraries(plasmanm_editor PUBLIC KF5::ModemManagerQt)
endif()
install(TARGETS plasmanm_editor ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -15,12 +15,6 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_fortisslvpnui plasmanetworkm
target_link_libraries(plasmanetworkmanagement_fortisslvpnui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
......
......@@ -15,15 +15,8 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_iodineui plasmanetworkmanage
target_link_libraries(plasmanetworkmanagement_iodineui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
KF5::CoreAddons
)
......
......@@ -17,12 +17,6 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_l2tpui plasmanetworkmanageme
target_link_libraries(plasmanetworkmanagement_l2tpui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
......
......@@ -44,13 +44,9 @@ if (OPENCONNECT_FOUND)
plasmanm_internal
plasmanm_editor
${NETWORKMANAGERQT5_LDFLAGS}
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::IconThemes
KF5::KIOWidgets
KF5::CoreAddons
${OPENCONNECT_LIBRARIES}
......
......@@ -15,15 +15,8 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_openswanui plasmanetworkmana
target_link_libraries(plasmanetworkmanagement_openswanui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
KF5::CoreAddons
)
......
......@@ -19,10 +19,11 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_openvpnui plasmanetworkmanag
target_link_libraries(plasmanetworkmanagement_openvpnui
plasmanm_internal
plasmanm_editor
Qt5::DBus
KF5::NetworkManagerQt
KF5::KIOCore
KF5::KIOWidgets
KF5::I18n
KF5::WidgetsAddons
KF5::CoreAddons
KF5::KDELibs4Support # KStandardDirs
)
install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -15,15 +15,8 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_pptpui plasmanetworkmanageme
target_link_libraries(plasmanetworkmanagement_pptpui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
KF5::CoreAddons
)
......
......@@ -15,12 +15,6 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_sshui plasmanetworkmanagemen
target_link_libraries(plasmanetworkmanagement_sshui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
......
......@@ -15,12 +15,6 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_sstpui plasmanetworkmanageme
target_link_libraries(plasmanetworkmanagement_sstpui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
......
......@@ -15,11 +15,9 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_strongswanui plasmanetworkma
target_link_libraries(plasmanetworkmanagement_strongswanui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
KF5::Service
KF5::I18n
KF5::KIOWidgets
KF5::NetworkManagerQt
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_strongswanui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -17,12 +17,7 @@ kcoreaddons_desktop_to_json(plasmanetworkmanagement_vpncui plasmanetworkmanageme
target_link_libraries(plasmanetworkmanagement_vpncui
plasmanm_internal
plasmanm_editor
Qt5::Widgets
Qt5::Network
Qt5::DBus
KF5::NetworkManagerQt
KF5::Service
KF5::Completion
KF5::ConfigCore
KF5::I18n
KF5::WidgetsAddons
KF5::KIOWidgets
......
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