Commit dbb0b515 authored by Arjen Hiemstra's avatar Arjen Hiemstra

Use KSysGuard namespace for KSysGuard targets

Summary:
With D29302 all KSysGuard targets have been placed in the KSysGuard namespace
and the KF5 versions deprecated. This changes KSysGuard to use the new
namespace. In addition, it renames the libkstats target from "PW5::KSysGuardBackend"
to "KSysGuard::StatsBackend".

Test Plan: Things still compile.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D29507
parent 75333fc1
......@@ -41,7 +41,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
WindowSystem
)
find_package(KF5 REQUIRED COMPONENTS SysGuard)
find_package(KSysGuard REQUIRED)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
......
......@@ -50,14 +50,14 @@ kf5_add_kdeinit_executable(ksysguard ${ksysguard_KDEINIT_SRCS})
target_compile_definitions(kdeinit_ksysguard PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
target_link_libraries(kdeinit_ksysguard
KF5::ProcessUi
KF5::SignalPlotter
KSysGuard::ProcessUi
KSysGuard::SysGuard
KSysGuard::SignalPlotter
KF5::DBusAddons
KF5::ItemViews
KF5::KIOWidgets
KF5::NewStuff
KF5::Notifications
KF5::SysGuard
KF5::I18n
KF5::IconThemes
KF5::WindowSystem)
......
......@@ -8,7 +8,7 @@ set_source_files_properties("ksysguard_iface.xml"
qt5_add_dbus_adaptor(SOURCES "ksysguard_iface.xml" ksysguarddaemon.h KSysGuardDaemon)
add_library(kstats_core STATIC ${SOURCES})
target_link_libraries(kstats_core PUBLIC Qt5::Core Qt5::DBus KF5::CoreAddons PW5::SysGuardBackend )
target_link_libraries(kstats_core PUBLIC Qt5::Core Qt5::DBus KF5::CoreAddons KSysGuard::StatsBackend )
add_executable(kstats main.cpp)
target_link_libraries(kstats kstats_core)
......
......@@ -7,7 +7,7 @@ set(ksgrdbackend_LIB_SRCS
)
add_library(ksgrdbackend ${ksgrdbackend_LIB_SRCS})
add_library(PW5::SysGuardBackend ALIAS ksgrdbackend)
add_library(KSysGuard::StatsBackend ALIAS ksgrdbackend)
target_link_libraries(ksgrdbackend PUBLIC Qt5::Core Qt5::DBus)
......
......@@ -3,6 +3,6 @@ set(KSYSGUARD_KSGRD_PLUGIN_SOURCES
)
add_library(ksysguard_ksgrd MODULE ${KSYSGUARD_KSGRD_PLUGIN_SOURCES})
target_link_libraries(ksysguard_ksgrd Qt5::Core Qt5::DBus PW5::SysGuardBackend KF5::SysGuard KF5::CoreAddons KF5::I18n)
target_link_libraries(ksysguard_ksgrd Qt5::Core Qt5::DBus KSysGuard::StatsBackend KSysGuard::SysGuard KF5::CoreAddons KF5::I18n)
install(TARGETS ksysguard_ksgrd DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksysguard)
......@@ -3,6 +3,6 @@ set(KSYSGUARD_NVIDIA_PLUGIN_SOURCES
)
add_library(ksysguard_plugin_nvidiaglobal MODULE ${KSYSGUARD_NVIDIA_PLUGIN_SOURCES})
target_link_libraries(ksysguard_plugin_nvidiaglobal Qt5::Core Qt5::DBus PW5::SysGuardBackend KF5::CoreAddons KF5::I18n)
target_link_libraries(ksysguard_plugin_nvidiaglobal Qt5::Core Qt5::DBus KSysGuard::StatsBackend KF5::CoreAddons KF5::I18n)
install(TARGETS ksysguard_plugin_nvidiaglobal DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksysguard)
......@@ -16,6 +16,6 @@ ecm_qt_declare_logging_category(networkplugin_SRCS
configure_file(networkconstants.h.in networkconstants.h @ONLY)
add_library(ksysguard_plugin_network MODULE ${networkplugin_SRCS})
target_link_libraries(ksysguard_plugin_network Qt5::Core Qt5::DBus KF5::CoreAddons KF5::I18n KF5::ProcessCore)
target_link_libraries(ksysguard_plugin_network Qt5::Core Qt5::DBus KF5::CoreAddons KF5::I18n KSysGuard::ProcessCore)
install(TARGETS ksysguard_plugin_network DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksysguard/process)
add_library(ksysguard_plugin_nvidia MODULE nvidia.cpp)
target_link_libraries(ksysguard_plugin_nvidia Qt5::Core KF5::ProcessCore KF5::I18n KF5::CoreAddons)
target_link_libraries(ksysguard_plugin_nvidia Qt5::Core KSysGuard::ProcessCore KF5::I18n KF5::CoreAddons)
install(TARGETS ksysguard_plugin_nvidia DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksysguard/process)
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