diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KSYSGUARD VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ksysguard_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KSysGuardConfigVersion.cmake" SOVERSION 9 ) @@ -125,20 +125,30 @@ install(DIRECTORY scripts/ DESTINATION ${KDE_INSTALL_DATADIR}/ksysguard/scripts) -set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_LIBDIR}/cmake/KF5SysGuard) +set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_LIBDIR}/cmake/KSysGuard) +configure_package_config_file(KSysGuardConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/KSysGuardConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) + configure_package_config_file(KF5SysGuardConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) + INSTALL_DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5SysGuard +) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfigVersion.cmake - DESTINATION ${CMAKECONFIG_INSTALL_DIR}) + ${CMAKE_CURRENT_BINARY_DIR}/KSysGuardConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/KSysGuardConfigVersion.cmake + DESTINATION ${CMAKECONFIG_INSTALL_DIR}) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/KF5SysGuardConfig.cmake + DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5SysGuard +) install(EXPORT libksysguardLibraryTargets - NAMESPACE KF5:: + NAMESPACE KSysGuard:: DESTINATION ${CMAKECONFIG_INSTALL_DIR} - FILE KF5SysGuardLibraryTargets.cmake ) + FILE KSysGuardLibraryTargets.cmake ) install(FILES libksysguard.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff --git a/KF5SysGuardConfig.cmake.in b/KF5SysGuardConfig.cmake.in --- a/KF5SysGuardConfig.cmake.in +++ b/KF5SysGuardConfig.cmake.in @@ -1,12 +1,17 @@ @PACKAGE_INIT@ +message(WARNING "The KF5:: namespace for KSysGuard targets is deprecated. Please use KSysGuard as namespace.") + include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @QT_MIN_VERSION@) -find_dependency(Qt5Network @QT_MIN_VERSION@) -find_dependency(Qt5Widgets @QT_MIN_VERSION@) +find_dependency(KSysGuard REQUIRED) -find_dependency(KF5Config @KF5_MIN_VERSION@) -find_dependency(KF5I18n @KF5_MIN_VERSION@) -find_dependency(KF5IconThemes @KF5_MIN_VERSION@) +macro(add_sysguard_target _target) + set_target_properties(KSysGuard::${_target} PROPERTIES IMPORTED_GLOBAL TRUE) + add_library(KF5::${_target} ALIAS KSysGuard::${_target}) +endmacro() -include("${CMAKE_CURRENT_LIST_DIR}/KF5SysGuardLibraryTargets.cmake") +add_sysguard_target(SysGuard) +add_sysguard_target(ProcessCore) +add_sysguard_target(ProcessUi) +add_sysguard_target(LsofUi) +add_sysguard_target(SignalPlotter) diff --git a/KF5SysGuardConfig.cmake.in b/KSysGuardConfig.cmake.in copy from KF5SysGuardConfig.cmake.in copy to KSysGuardConfig.cmake.in --- a/KF5SysGuardConfig.cmake.in +++ b/KSysGuardConfig.cmake.in @@ -9,4 +9,4 @@ find_dependency(KF5I18n @KF5_MIN_VERSION@) find_dependency(KF5IconThemes @KF5_MIN_VERSION@) -include("${CMAKE_CURRENT_LIST_DIR}/KF5SysGuardLibraryTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/KSysGuardLibraryTargets.cmake") diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -5,25 +5,25 @@ # Process unit test ecm_qt_declare_logging_category(processtest_debug_SRCS HEADER processcore_debug.h IDENTIFIER LIBKSYSGUARD_PROCESSCORE CATEGORY_NAME org.kde.libksysguard.processcore) ecm_add_test(processtest.cpp ${processtest_debug_SRCS} TEST_NAME processtest - LINK_LIBRARIES KF5::ProcessUi Qt5::Test) + LINK_LIBRARIES KSysGuard::ProcessUi Qt5::Test) endif() if (KF5Plasma_FOUND) set(SIGNALPLOTTER_DEBUG_SRCS) ecm_qt_declare_logging_category(SIGNALPLOTTER_DEBUG_SRCS HEADER ksignalplotter_debug.h IDENTIFIER LIBKSYSGUARD_KSIGNALPLOTTER CATEGORY_NAME org.kde.libksysguard.ksignalplotter) ecm_add_test(signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp ${SIGNALPLOTTER_DEBUG_SRCS} TEST_NAME signalplotterbenchmark - LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes + LINK_LIBRARIES KSysGuard::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes ) ecm_add_test(graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp ${SIGNALPLOTTER_DEBUG_SRCS} TEST_NAME graphicssignalplotterbenchmark - LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma + LINK_LIBRARIES KSysGuard::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma ) ecm_add_test(signalplottertest.cpp ../signalplotter/ksignalplotter.cpp ${SIGNALPLOTTER_DEBUG_SRCS} TEST_NAME signalplottertest - LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes + LINK_LIBRARIES KSysGuard::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes ) endif() diff --git a/ksgrd/CMakeLists.txt b/ksgrd/CMakeLists.txt --- a/ksgrd/CMakeLists.txt +++ b/ksgrd/CMakeLists.txt @@ -16,7 +16,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) add_library(ksgrd ${ksgrd_LIB_SRCS}) -add_library(KF5::SysGuard ALIAS ksgrd) +add_library(KSysGuard::SysGuard ALIAS ksgrd) target_include_directories(ksgrd PUBLIC "$" @@ -31,7 +31,7 @@ PRIVATE KF5::I18n KF5::CoreAddons - KF5::ProcessCore + KSysGuard::ProcessCore ) set_target_properties(ksgrd PROPERTIES VERSION ${KSYSGUARD_VERSION_STRING} SOVERSION ${KSYSGUARD_SOVERSION} EXPORT_NAME SysGuard) diff --git a/lsofui/CMakeLists.txt b/lsofui/CMakeLists.txt --- a/lsofui/CMakeLists.txt +++ b/lsofui/CMakeLists.txt @@ -10,7 +10,7 @@ ) add_library(lsofui ${lsofui_LIB_SRCS}) -add_library(KF5::LsofUi ALIAS lsofui) +add_library(KSysGuard::LsofUi ALIAS lsofui) target_link_libraries(lsofui PUBLIC diff --git a/processcore/CMakeLists.txt b/processcore/CMakeLists.txt --- a/processcore/CMakeLists.txt +++ b/processcore/CMakeLists.txt @@ -19,7 +19,6 @@ ecm_qt_declare_logging_category(ksysguard_LIB_SRCS HEADER processcore_debug.h IDENTIFIER LIBKSYSGUARD_PROCESSCORE CATEGORY_NAME org.kde.libksysguard.processcore) add_library(processcore ${ksysguard_LIB_SRCS}) -add_library(KF5::ProcessCore ALIAS processcore) add_library(KSysGuard::ProcessCore ALIAS processcore) target_link_libraries(processcore diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt --- a/processui/CMakeLists.txt +++ b/processui/CMakeLists.txt @@ -23,16 +23,16 @@ ) add_library(processui ${processui_LIB_SRCS}) -add_library(KF5::ProcessUi ALIAS processui) +add_library(KSysGuard::ProcessUi ALIAS processui) if(X11_XRes_FOUND) target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES}) include_directories(${X11_XRes_INCLUDE_PATH}) endif() target_link_libraries(processui PUBLIC - KF5::ProcessCore + KSysGuard::ProcessCore Qt5::Widgets KF5::ConfigCore PRIVATE diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt --- a/signalplotter/CMakeLists.txt +++ b/signalplotter/CMakeLists.txt @@ -7,15 +7,15 @@ ) ecm_qt_declare_logging_category(ksignalplotter_LIB_SRCS HEADER ksignalplotter_debug.h IDENTIFIER LIBKSYSGUARD_KSIGNALPLOTTER CATEGORY_NAME org.kde.libksysguard.ksignalplotter) add_library(ksignalplotter ${ksignalplotter_LIB_SRCS}) -add_library(KF5::SignalPlotter ALIAS ksignalplotter) +add_library(KSysGuard::SignalPlotter ALIAS ksignalplotter) target_link_libraries(ksignalplotter PUBLIC Qt5::Widgets KF5::I18n # klocalizedstring.h KF5::IconThemes PRIVATE - KF5::ProcessCore + KSysGuard::ProcessCore KF5::Plasma )