diff --git a/CMakeLists.txt b/CMakeLists.txt index 697e622e..845a8f42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,97 +1,97 @@ cmake_minimum_required(VERSION 3.0) project(ksysguard) set(PROJECT_VERSION "5.18.80") set(KSYSGUARD_VERSION 4.98.0) set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}") set(QT_MIN_VERSION "5.14.0") set(KF5_MIN_VERSION "5.58.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(CheckIncludeFiles) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDEClangFormat) include(ECMAddTests) include(ECMInstallIcons) include(FeatureSummary) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test ) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons DBusAddons DocTools I18n IconThemes Init ItemViews KIO NewStuff Notifications WindowSystem ) -find_package(KF5 REQUIRED COMPONENTS SysGuard) +find_package(KSysGuard REQUIRED) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) #add_definitions(-DQT_NO_CAST_FROM_ASCII) #add_definitions(-DQT_NO_CAST_TO_ASCII) #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) endif() find_package(Sensors) set_package_properties(Sensors PROPERTIES TYPE OPTIONAL PURPOSE "Allows to show sensor information") find_package(libpcap) set_package_properties( libpcap PROPERTIES TYPE RECOMMENDED PURPOSE "libpcap is used for per-application network usage." ) if (libpcap_FOUND) find_package(Libcap) set_package_properties(Libcap PROPERTIES TYPE OPTIONAL PURPOSE "Needed for setting capabilities of the per-application network plugin." ) endif() include_directories(${CMAKE_CURRENT_BINARY_DIR}) configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) add_subdirectory( gui ) add_subdirectory( doc ) add_subdirectory( pics ) add_subdirectory( example ) add_subdirectory( ksysguardd ) add_subdirectory(kstats) add_subdirectory(libkstats) add_subdirectory( plugins ) # add clang-format target for all our real source files file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index cf160d58..d1936ed1 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,75 +1,75 @@ include_directories( SensorDisplayLib/ ) ########### next target ############### add_definitions(-DTRANSLATION_DOMAIN=\"ksysguard\") set(libsensordisplays_SRCS SensorDisplayLib/SensorDisplay.cpp SensorDisplayLib/BarGraph.cpp SensorDisplayLib/DancingBars.cpp SensorDisplayLib/DancingBarsSettings.cpp SensorDisplayLib/DummyDisplay.cpp SensorDisplayLib/FancyPlotter.cpp SensorDisplayLib/FancyPlotterSettings.cpp SensorDisplayLib/ListView.cpp SensorDisplayLib/LogFile.cpp SensorDisplayLib/MultiMeter.cpp SensorDisplayLib/MultiMeterSettings.cpp SensorDisplayLib/ProcessController.cpp SensorDisplayLib/SensorLogger.cpp SensorDisplayLib/SensorLoggerDlg.cpp SensorDisplayLib/SensorLoggerSettings.cpp SensorDisplayLib/SensorModel.cpp SensorDisplayLib/ListViewSettings.cpp # SensorDisplayLib/modeltest.cpp ) ki18n_wrap_ui( libsensordisplays_SRCS SensorDisplayLib/ListViewSettingsWidget.ui SensorDisplayLib/LogFileSettings.ui SensorDisplayLib/MultiMeterSettingsWidget.ui SensorDisplayLib/SensorLoggerDlgWidget.ui SensorDisplayLib/SensorLoggerSettingsWidget.ui ) set(ksysguard_KDEINIT_SRCS ${libsensordisplays_SRCS} ksortfilterproxymodel.cpp SensorBrowser.cpp WorkSheet.cpp WorkSheetSettings.cpp Workspace.cpp HostConnector.cpp StyleEngine.cpp ksysguard.cpp ) 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) install(TARGETS kdeinit_ksysguard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS ksysguard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install( PROGRAMS org.kde.ksysguard.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) install( FILES org.kde.ksysguard.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) install( FILES ProcessTable.sgrd SystemLoad2.sgrd DESTINATION ${KDE_INSTALL_DATADIR}/ksysguard ) install( FILES ksysguardui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/ksysguard ) install( FILES ksysguard.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kstats/CMakeLists.txt b/kstats/CMakeLists.txt index 5de2838c..c8391734 100644 --- a/kstats/CMakeLists.txt +++ b/kstats/CMakeLists.txt @@ -1,21 +1,21 @@ set(SOURCES client.cpp ksysguarddaemon.cpp ) set_source_files_properties("ksysguard_iface.xml" PROPERTIES INCLUDE "../ksysguard-backend/types.h" ) 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) install(TARGETS kstats DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) kdbusaddons_generate_dbus_service_file(kstats org.kde.kstats ${KDE_INSTALL_FULL_BINDIR}) add_subdirectory(test) add_subdirectory(autotests) diff --git a/libkstats/CMakeLists.txt b/libkstats/CMakeLists.txt index 44118e30..76dbf23f 100644 --- a/libkstats/CMakeLists.txt +++ b/libkstats/CMakeLists.txt @@ -1,20 +1,20 @@ set(ksgrdbackend_LIB_SRCS AggregateSensor.cpp SensorObject.cpp SensorContainer.cpp SensorPlugin.cpp SensorProperty.cpp ) 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) set_target_properties(ksgrdbackend PROPERTIES EXPORT_NAME SysGuardBackend ) install(TARGETS ksgrdbackend EXPORT libKSysGuardbackendTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) # Headers are currently not installed as we don't offer compatability yet diff --git a/plugins/global/ksgrd/CMakeLists.txt b/plugins/global/ksgrd/CMakeLists.txt index 1817c894..42da114e 100644 --- a/plugins/global/ksgrd/CMakeLists.txt +++ b/plugins/global/ksgrd/CMakeLists.txt @@ -1,8 +1,8 @@ set(KSYSGUARD_KSGRD_PLUGIN_SOURCES ksgrdiface.cpp ) 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 index df5f544e..ae07c3da 100644 --- a/plugins/global/nvidia/CMakeLists.txt +++ b/plugins/global/nvidia/CMakeLists.txt @@ -1,8 +1,8 @@ set(KSYSGUARD_NVIDIA_PLUGIN_SOURCES nvidia.cpp ) 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 index d7a2e047..c449bfa0 100644 --- a/plugins/process/network/CMakeLists.txt +++ b/plugins/process/network/CMakeLists.txt @@ -1,21 +1,21 @@ include(ECMQtDeclareLoggingCategory) add_subdirectory(helper) set(networkplugin_SRCS network.cpp ) ecm_qt_declare_logging_category(networkplugin_SRCS HEADER networklogging.h IDENTIFIER KSYSGUARD_PLUGIN_NETWORK CATEGORY_NAME org.kde.ksysguard.plugin.network ) 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 index 7b36916f..87b83793 100644 --- 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)