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.
This commit is contained in:
Sebastian Kügler 2013-10-16 00:47:47 +02:00
parent cd5ee90d0e
commit d5bef21f7b
19 changed files with 35 additions and 37 deletions

View File

@ -7,6 +7,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/PlasmaTargets.cmake")
set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
set_and_check(Plasma_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") 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") include("${CMAKE_CURRENT_LIST_DIR}/PlasmaMacros.cmake")

View File

@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-customDataContainers.desktop)
plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS}) plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS})
target_link_libraries(plasma_dataengine_example_customDataContainers target_link_libraries(plasma_dataengine_example_customDataContainers
plasma Plasma
KF5::KIOCore KF5::KIOCore
KF5::KService KF5::KService
) )

View File

@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-simpleEngine.desktop)
plasma_add_plugin(plasma_dataengine_example_simpleEngine ${simpleEngine_SRCS}) plasma_add_plugin(plasma_dataengine_example_simpleEngine ${simpleEngine_SRCS})
target_link_libraries(plasma_dataengine_example_simpleEngine target_link_libraries(plasma_dataengine_example_simpleEngine
plasma Plasma
${KService_LIBRARIES} ${KService_LIBRARIES}
${KI18n_LIBRARIES} ${KI18n_LIBRARIES}
) )

View File

@ -7,7 +7,7 @@ kservice_desktop_to_json(plasma-dataengine-example-sourcesOnRequest.desktop)
plasma_add_plugin(plasma_dataengine_example_sourcesOnRequest ${sourcesOnRequest_SRCS}) plasma_add_plugin(plasma_dataengine_example_sourcesOnRequest ${sourcesOnRequest_SRCS})
target_link_libraries(plasma_dataengine_example_sourcesOnRequest target_link_libraries(plasma_dataengine_example_sourcesOnRequest
plasma Plasma
${KService_LIBRARIES} ${KService_LIBRARIES}
) )

View File

@ -37,7 +37,7 @@ target_link_libraries(corebindingsplugin
${KCore_LIBRARIES} ${KCore_LIBRARIES}
KF5::KIconThemes KF5::KIconThemes
KF5::KWindowSystem KF5::KWindowSystem
plasma) Plasma)
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(corebindingsplugin ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} ) target_link_libraries(corebindingsplugin ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )

View File

@ -14,7 +14,7 @@ add_executable(sortfiltermodeltest
qt4_automoc(sortfiltermodeltest.cpp) qt4_automoc(sortfiltermodeltest.cpp)
target_link_libraries(sortfiltermodeltest target_link_libraries(sortfiltermodeltest
plasma Plasma
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY} ${QT_QTTEST_LIBRARY}
${KDE4Support_LIBRARIES} ${KDE4Support_LIBRARIES}

View File

@ -10,7 +10,7 @@ target_link_libraries(runnermodelplugin
${Qt5Quick_LIBRARIES} ${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
KF5::KI18n KF5::KI18n
plasma Plasma
) )

View File

@ -21,7 +21,7 @@ target_link_libraries(plasmacomponentsplugin
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${KDeclarative_LIBRARIES} ${KDeclarative_LIBRARIES}
plasma) Plasma)
install(TARGETS plasmacomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/components) install(TARGETS plasmacomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/components)

View File

@ -20,7 +20,7 @@ target_link_libraries(plasmaextracomponentsplugin
${Qt5Quick_LIBRARIES} ${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES} ${Qt5Qml_LIBRARIES}
${KACTIVITIES_LIBRARY} ${KACTIVITIES_LIBRARY}
plasma) Plasma)
install(TARGETS plasmaextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/extras) install(TARGETS plasmaextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/extras)

View File

@ -20,7 +20,7 @@ target_link_libraries(qtextracomponentsplugin
${QT_QTGUI_LIBRARY} ${QT_QTGUI_LIBRARY}
${KDeclarative_LIBRARIES} ${KDeclarative_LIBRARIES}
KF5::KIconThemes KF5::KIconThemes
plasma) Plasma)
install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents) install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents)

View File

@ -55,7 +55,7 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209)
########### next target ############### ########### next target ###############
set(plasma_LIB_SRCS set(Plasma_LIB_SRCS
#global #global
plasma.cpp plasma.cpp
pluginloader.cpp pluginloader.cpp
@ -111,9 +111,9 @@ set(plasma_LIB_SRCS
scripting/scriptengine.cpp 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( #NEPOMUK_GENERATE_FROM_ONTOLOGY(
# nwc.nrl # 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::Network
Qt5::Sql Qt5::Sql
Qt5::Quick # needed in service.cpp, remove? Qt5::Quick # needed in service.cpp, remove?
@ -149,31 +149,31 @@ target_link_libraries(plasma
) )
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES}) target_link_libraries(Plasma Qt5::X11Extras ${X11_LIBRARIES})
endif(X11_FOUND) endif(X11_FOUND)
if(DL_LIBRARY) if(DL_LIBRARY)
target_link_libraries(plasma ${DL_LIBRARY}) target_link_libraries(Plasma ${DL_LIBRARY})
endif(DL_LIBRARY) endif(DL_LIBRARY)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets) target_link_libraries(Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
target_include_directories(plasma PUBLIC target_include_directories(Plasma PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>"
) )
target_include_directories(plasma INTERFACE target_include_directories(Plasma INTERFACE
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/KDE>" "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/KDE>"
) )
#do NOT use GENERIC versioning -- the plasma team will take care of versioning #do NOT use GENERIC versioning -- the Plasma team will take care of versioning
set_target_properties(plasma PROPERTIES set_target_properties(Plasma PROPERTIES
VERSION 5.0.0 VERSION 5.0.0
SOVERSION 5 SOVERSION 5
) )
########### install files ############### ########### install files ###############
generate_export_header(plasma) generate_export_header(Plasma)
set(plasma_LIB_INCLUDES set(Plasma_LIB_INCLUDES
abstractrunner.h abstractrunner.h
applet.h applet.h
configloader.h configloader.h
@ -201,7 +201,7 @@ set(plasma_LIB_INCLUDES
install(FILES install(FILES
${plasma_LIB_INCLUDES} ${Plasma_LIB_INCLUDES}
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
install(DIRECTORY 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/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
install(FILES data/operations/storage.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})

View File

@ -10,7 +10,7 @@ MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp) add_executable(${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
plasma KF5::KArchive KF5::KCoreAddons Plasma KF5::KArchive KF5::KCoreAddons
KF5::KConfigGui KF5::KConfigGui
KF5::KI18n KF5::KI18n
KF5::KIOCore KF5::KIOCore
@ -32,7 +32,7 @@ PLASMA_UNIT_TESTS(
) )
add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp) 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) add_test(plasma-storagetest storagetest)
ecm_mark_as_test(plasma-storagetest) ecm_mark_as_test(plasma-storagetest)

View File

@ -5,7 +5,7 @@ add_executable(plugintest
plugintest.cpp 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}") message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

View File

@ -5,7 +5,7 @@ add_executable(plasmapkg
plasmapkg.cpp 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}") message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

View File

@ -23,7 +23,7 @@ target_link_libraries(PlasmaQuick
KF5::KService KF5::KService
KF5::KCoreAddons KF5::KCoreAddons
KF5::XmlGui KF5::XmlGui
plasma Plasma
KF5::KDeclarative KF5::KDeclarative
) )

View File

@ -12,7 +12,7 @@ MACRO(PLASMA_UNIT_TESTS)
target_link_libraries(${_testname} target_link_libraries(${_testname}
Qt5::Test Qt5::Test
Qt5::Declarative Qt5::Declarative
plasma KF5::KArchive KF5::KCoreAddons Plasma KF5::KArchive KF5::KCoreAddons
KF5::KConfigGui KF5::KConfigGui
KF5::KI18n KF5::KI18n
KF5::KIOCore KF5::KIOCore

View File

@ -13,15 +13,13 @@ plasma_add_plugin(kded_platformstatus ${kded_platformstatus_SRCS} )
target_link_libraries( target_link_libraries(
kded_platformstatus kded_platformstatus
${KCore_LIBRARIES}
KF5::KService KF5::KService
KF5::KCoreAddons KF5::KCoreAddons
${KDBusAddons_LIBRARIES} KF5::KDBusAddons
KF5::KI18n KF5::KI18n
KF5::KIOCore KF5::KIOWidgets KF5::KIOCore KF5::KIOWidgets
Qt5::DBus Qt5::DBus
Qt5::Quick Qt5::Quick
#${KDE4_KIO_LIBS}
) )
install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} ) install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} )

View File

@ -28,7 +28,7 @@ target_link_libraries(plasma_appletscript_declarative
KF5::KDE4Attic KF5::KDE4Attic
KF5::KDeclarative KF5::KDeclarative
KF5::KI18n KF5::KI18n
plasma Plasma
PlasmaQuick PlasmaQuick
) )

View File

@ -67,7 +67,7 @@ target_link_libraries(plasma-shell
KF5::KIOCore KF5::KIOCore
${KWindowSystem_LIBRARIES} ${KWindowSystem_LIBRARIES}
KF5::KCoreAddons KF5::KCoreAddons
plasma Plasma
PlasmaQuick PlasmaQuick
${Qt5Script_LIBRARIES} ${Qt5Script_LIBRARIES}
${KDE4Support_LIBRARIES} ${KDE4Support_LIBRARIES}