diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ WindowSystem ) -find_package(KF5 REQUIRED COMPONENTS SysGuard) +find_package(KSysGuard REQUIRED) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -50,14 +50,14 @@ 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) diff --git a/kstats/CMakeLists.txt b/kstats/CMakeLists.txt --- a/kstats/CMakeLists.txt +++ b/kstats/CMakeLists.txt @@ -8,7 +8,7 @@ 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) diff --git a/libkstats/CMakeLists.txt b/libkstats/CMakeLists.txt --- a/libkstats/CMakeLists.txt +++ b/libkstats/CMakeLists.txt @@ -7,7 +7,7 @@ ) 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) diff --git a/plugins/global/ksgrd/CMakeLists.txt b/plugins/global/ksgrd/CMakeLists.txt --- a/plugins/global/ksgrd/CMakeLists.txt +++ b/plugins/global/ksgrd/CMakeLists.txt @@ -3,6 +3,6 @@ ) 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) diff --git a/plugins/global/nvidia/CMakeLists.txt b/plugins/global/nvidia/CMakeLists.txt --- a/plugins/global/nvidia/CMakeLists.txt +++ b/plugins/global/nvidia/CMakeLists.txt @@ -3,6 +3,6 @@ ) 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) diff --git a/plugins/process/network/CMakeLists.txt b/plugins/process/network/CMakeLists.txt --- a/plugins/process/network/CMakeLists.txt +++ b/plugins/process/network/CMakeLists.txt @@ -16,6 +16,6 @@ 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) diff --git a/plugins/process/nvidia/CMakeLists.txt b/plugins/process/nvidia/CMakeLists.txt --- a/plugins/process/nvidia/CMakeLists.txt +++ b/plugins/process/nvidia/CMakeLists.txt @@ -1,3 +1,3 @@ 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)