From d5bef21f7b6e5edfe54da02c9f75debc41352254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Wed, 16 Oct 2013 00:47:47 +0200 Subject: [PATCH] Rename target plasma to Plasma This is in line with the frameworks naming policy, camelcasing. Up until now, libplasma was the only library being KF5::plasma, that is now KF5::Plasma. --- PlasmaConfig.cmake.in | 2 +- .../customDataContainers/CMakeLists.txt | 2 +- .../dataengines/simpleEngine/CMakeLists.txt | 2 +- .../sourcesOnRequest/CMakeLists.txt | 2 +- src/declarativeimports/core/CMakeLists.txt | 2 +- .../core/tests/CMakeLists.txt | 2 +- .../krunnermodel/CMakeLists.txt | 2 +- .../plasmacomponents/CMakeLists.txt | 2 +- .../plasmaextracomponents/CMakeLists.txt | 2 +- .../qtextracomponents/CMakeLists.txt | 2 +- src/plasma/CMakeLists.txt | 32 +++++++++---------- src/plasma/autotests/CMakeLists.txt | 4 +-- src/plasma/tests/kplugins/CMakeLists.txt | 2 +- src/plasmapkg/CMakeLists.txt | 2 +- src/plasmaquick/CMakeLists.txt | 2 +- src/plasmaquick/autotests/CMakeLists.txt | 2 +- src/platformstatus/CMakeLists.txt | 4 +-- src/scriptengines/qml/CMakeLists.txt | 2 +- src/shell/CMakeLists.txt | 2 +- 19 files changed, 35 insertions(+), 37 deletions(-) diff --git a/PlasmaConfig.cmake.in b/PlasmaConfig.cmake.in index 06cecae06..63318823c 100644 --- a/PlasmaConfig.cmake.in +++ b/PlasmaConfig.cmake.in @@ -7,6 +7,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/PlasmaTargets.cmake") set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(Plasma_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -set(Plasma_LIBRARIES KF5::plasma) +set(Plasma_LIBRARIES KF5::Plasma) include("${CMAKE_CURRENT_LIST_DIR}/PlasmaMacros.cmake") diff --git a/examples/dataengines/customDataContainers/CMakeLists.txt b/examples/dataengines/customDataContainers/CMakeLists.txt index 6185a7bc8..7fcaa27b1 100644 --- a/examples/dataengines/customDataContainers/CMakeLists.txt +++ b/examples/dataengines/customDataContainers/CMakeLists.txt @@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-customDataContainers.desktop) plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS}) target_link_libraries(plasma_dataengine_example_customDataContainers - plasma + Plasma KF5::KIOCore KF5::KService ) diff --git a/examples/dataengines/simpleEngine/CMakeLists.txt b/examples/dataengines/simpleEngine/CMakeLists.txt index 635006542..e570dde9c 100644 --- a/examples/dataengines/simpleEngine/CMakeLists.txt +++ b/examples/dataengines/simpleEngine/CMakeLists.txt @@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-simpleEngine.desktop) plasma_add_plugin(plasma_dataengine_example_simpleEngine ${simpleEngine_SRCS}) target_link_libraries(plasma_dataengine_example_simpleEngine - plasma + Plasma ${KService_LIBRARIES} ${KI18n_LIBRARIES} ) diff --git a/examples/dataengines/sourcesOnRequest/CMakeLists.txt b/examples/dataengines/sourcesOnRequest/CMakeLists.txt index e89bbbbb6..027785e9e 100644 --- a/examples/dataengines/sourcesOnRequest/CMakeLists.txt +++ b/examples/dataengines/sourcesOnRequest/CMakeLists.txt @@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-sourcesOnRequest.desktop) plasma_add_plugin(plasma_dataengine_example_sourcesOnRequest ${sourcesOnRequest_SRCS}) target_link_libraries(plasma_dataengine_example_sourcesOnRequest - plasma + Plasma ${KService_LIBRARIES} ) diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index 6925e294f..732f34810 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(corebindingsplugin ${KCore_LIBRARIES} KF5::KIconThemes KF5::KWindowSystem - plasma) + Plasma) if(X11_FOUND) target_link_libraries(corebindingsplugin ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} ) diff --git a/src/declarativeimports/core/tests/CMakeLists.txt b/src/declarativeimports/core/tests/CMakeLists.txt index 6dc410c0b..974e8bbfc 100644 --- a/src/declarativeimports/core/tests/CMakeLists.txt +++ b/src/declarativeimports/core/tests/CMakeLists.txt @@ -14,7 +14,7 @@ add_executable(sortfiltermodeltest qt4_automoc(sortfiltermodeltest.cpp) target_link_libraries(sortfiltermodeltest - plasma + Plasma ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4Support_LIBRARIES} diff --git a/src/declarativeimports/krunnermodel/CMakeLists.txt b/src/declarativeimports/krunnermodel/CMakeLists.txt index a9fc832b2..f66f3eeab 100644 --- a/src/declarativeimports/krunnermodel/CMakeLists.txt +++ b/src/declarativeimports/krunnermodel/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(runnermodelplugin ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} KF5::KI18n - plasma + Plasma ) diff --git a/src/declarativeimports/plasmacomponents/CMakeLists.txt b/src/declarativeimports/plasmacomponents/CMakeLists.txt index 90d2563f4..197fa6a2b 100644 --- a/src/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/src/declarativeimports/plasmacomponents/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(plasmacomponentsplugin ${Qt5Qml_LIBRARIES} ${QT_QTGUI_LIBRARY} ${KDeclarative_LIBRARIES} - plasma) + Plasma) install(TARGETS plasmacomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/components) diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt index 15da84856..aa7434aa5 100644 --- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(plasmaextracomponentsplugin ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} ${KACTIVITIES_LIBRARY} - plasma) + Plasma) install(TARGETS plasmaextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/extras) diff --git a/src/declarativeimports/qtextracomponents/CMakeLists.txt b/src/declarativeimports/qtextracomponents/CMakeLists.txt index 1e9b36a64..3dfd41935 100644 --- a/src/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(qtextracomponentsplugin ${QT_QTGUI_LIBRARY} ${KDeclarative_LIBRARIES} KF5::KIconThemes - plasma) + Plasma) install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index ab0b75d2e..4a4ff3489 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -55,7 +55,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209) ########### next target ############### -set(plasma_LIB_SRCS +set(Plasma_LIB_SRCS #global plasma.cpp pluginloader.cpp @@ -111,9 +111,9 @@ set(plasma_LIB_SRCS scripting/scriptengine.cpp ) -set(plasma_LIB_SRCS ${plasma_LIB_SRCS} private/effectwatcher.cpp) +set(Plasma_LIB_SRCS ${Plasma_LIB_SRCS} private/effectwatcher.cpp) -kconfig_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc) +kconfig_add_kcfg_files(Plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc) #NEPOMUK_GENERATE_FROM_ONTOLOGY( # nwc.nrl @@ -124,9 +124,9 @@ kconfig_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcf #) -add_library(plasma SHARED ${plasma_LIB_SRCS}) +add_library(Plasma SHARED ${Plasma_LIB_SRCS}) -target_link_libraries(plasma +target_link_libraries(Plasma Qt5::Network Qt5::Sql Qt5::Quick # needed in service.cpp, remove? @@ -149,31 +149,31 @@ target_link_libraries(plasma ) if(X11_FOUND) - target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES}) + target_link_libraries(Plasma Qt5::X11Extras ${X11_LIBRARIES}) endif(X11_FOUND) if(DL_LIBRARY) - target_link_libraries(plasma ${DL_LIBRARY}) + target_link_libraries(Plasma ${DL_LIBRARY}) endif(DL_LIBRARY) -target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets) -target_include_directories(plasma PUBLIC +target_link_libraries(Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets) +target_include_directories(Plasma PUBLIC "$" ) -target_include_directories(plasma INTERFACE +target_include_directories(Plasma INTERFACE "$" ) -#do NOT use GENERIC versioning -- the plasma team will take care of versioning -set_target_properties(plasma PROPERTIES +#do NOT use GENERIC versioning -- the Plasma team will take care of versioning +set_target_properties(Plasma PROPERTIES VERSION 5.0.0 SOVERSION 5 ) ########### install files ############### -generate_export_header(plasma) +generate_export_header(Plasma) -set(plasma_LIB_INCLUDES +set(Plasma_LIB_INCLUDES abstractrunner.h applet.h configloader.h @@ -201,7 +201,7 @@ set(plasma_LIB_INCLUDES install(FILES - ${plasma_LIB_INCLUDES} + ${Plasma_LIB_INCLUDES} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel) install(DIRECTORY @@ -234,5 +234,5 @@ install(FILES data/operations/dataengineservice.operations DESTINATION ${DATA_IN install(FILES data/operations/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) install(FILES data/operations/storage.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services) -install(TARGETS plasma EXPORT PlasmaTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS Plasma EXPORT PlasmaTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/plasma/autotests/CMakeLists.txt b/src/plasma/autotests/CMakeLists.txt index 6b2b4a214..1b8dbd577 100644 --- a/src/plasma/autotests/CMakeLists.txt +++ b/src/plasma/autotests/CMakeLists.txt @@ -10,7 +10,7 @@ MACRO(PLASMA_UNIT_TESTS) FOREACH(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - plasma KF5::KArchive KF5::KCoreAddons + Plasma KF5::KArchive KF5::KCoreAddons KF5::KConfigGui KF5::KI18n KF5::KIOCore @@ -32,7 +32,7 @@ PLASMA_UNIT_TESTS( ) add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp) -target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} KF5::KIOCore plasma KF5::KCoreAddons ) +target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} KF5::KIOCore Plasma KF5::KCoreAddons ) add_test(plasma-storagetest storagetest) ecm_mark_as_test(plasma-storagetest) diff --git a/src/plasma/tests/kplugins/CMakeLists.txt b/src/plasma/tests/kplugins/CMakeLists.txt index 2a2ab2fef..ebdba6679 100644 --- a/src/plasma/tests/kplugins/CMakeLists.txt +++ b/src/plasma/tests/kplugins/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(plugintest plugintest.cpp ) -target_link_libraries(plugintest plasma KF5::KI18n KF5::KService Qt5::DBus) +target_link_libraries(plugintest Plasma KF5::KI18n KF5::KService Qt5::DBus) message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") diff --git a/src/plasmapkg/CMakeLists.txt b/src/plasmapkg/CMakeLists.txt index d1af1643c..7eb41d881 100644 --- a/src/plasmapkg/CMakeLists.txt +++ b/src/plasmapkg/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(plasmapkg plasmapkg.cpp ) -target_link_libraries(plasmapkg plasma KF5::KI18n KF5::KService KF5::KCoreAddons Qt5::DBus) +target_link_libraries(plasmapkg Plasma KF5::KI18n KF5::KService KF5::KCoreAddons Qt5::DBus) message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index 501a4f289..4b7bc5c8c 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(PlasmaQuick KF5::KService KF5::KCoreAddons KF5::XmlGui - plasma + Plasma KF5::KDeclarative ) diff --git a/src/plasmaquick/autotests/CMakeLists.txt b/src/plasmaquick/autotests/CMakeLists.txt index 5070a846d..1e538e20b 100644 --- a/src/plasmaquick/autotests/CMakeLists.txt +++ b/src/plasmaquick/autotests/CMakeLists.txt @@ -12,7 +12,7 @@ MACRO(PLASMA_UNIT_TESTS) target_link_libraries(${_testname} Qt5::Test Qt5::Declarative - plasma KF5::KArchive KF5::KCoreAddons + Plasma KF5::KArchive KF5::KCoreAddons KF5::KConfigGui KF5::KI18n KF5::KIOCore diff --git a/src/platformstatus/CMakeLists.txt b/src/platformstatus/CMakeLists.txt index c98927bb4..cb8fca88a 100644 --- a/src/platformstatus/CMakeLists.txt +++ b/src/platformstatus/CMakeLists.txt @@ -13,15 +13,13 @@ plasma_add_plugin(kded_platformstatus ${kded_platformstatus_SRCS} ) target_link_libraries( kded_platformstatus - ${KCore_LIBRARIES} KF5::KService KF5::KCoreAddons - ${KDBusAddons_LIBRARIES} + KF5::KDBusAddons KF5::KI18n KF5::KIOCore KF5::KIOWidgets Qt5::DBus Qt5::Quick - #${KDE4_KIO_LIBS} ) install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt index 80fcf220b..c05be5682 100644 --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(plasma_appletscript_declarative KF5::KDE4Attic KF5::KDeclarative KF5::KI18n - plasma + Plasma PlasmaQuick ) diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index a71d05169..549246764 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -67,7 +67,7 @@ target_link_libraries(plasma-shell KF5::KIOCore ${KWindowSystem_LIBRARIES} KF5::KCoreAddons - plasma + Plasma PlasmaQuick ${Qt5Script_LIBRARIES} ${KDE4Support_LIBRARIES}