From f35e514b7de45460178ad60ceb79b1be43d13209 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Wed, 9 Dec 2015 23:10:41 +0000 Subject: [PATCH] Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json() --- src/scriptengines/qml/CMakeLists.txt | 6 +++++- templates/cpp-plasmoid/src/CMakeLists.txt | 2 +- tests/testengine/CMakeLists.txt | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt index b63292783..842fc88d4 100644 --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -19,7 +19,11 @@ set(declarative_appletscript_SRCS add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SRCS} ) set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "") -kcoreaddons_desktop_to_json(plasma_appletscript_declarative data/plasma-scriptengine-applet-declarative.desktop) +kcoreaddons_desktop_to_json( + plasma_appletscript_declarative data/plasma-scriptengine-applet-declarative.desktop + SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/plasma/data/servicetypes/plasma-scriptengine.desktop +) + target_link_libraries(plasma_appletscript_declarative Qt5::Quick diff --git a/templates/cpp-plasmoid/src/CMakeLists.txt b/templates/cpp-plasmoid/src/CMakeLists.txt index 787a16a7c..36ab39dd6 100644 --- a/templates/cpp-plasmoid/src/CMakeLists.txt +++ b/templates/cpp-plasmoid/src/CMakeLists.txt @@ -6,7 +6,7 @@ set(%{APPNAMELC}_SRCS add_library(plasma_applet_%{APPNAMELC} MODULE ${%{APPNAMELC}_SRCS}) -kcoreaddons_desktop_to_json(plasma_applet_%{APPNAMELC} package/metadata.desktop) +kcoreaddons_desktop_to_json(plasma_applet_%{APPNAMELC} package/metadata.desktop SERVICE_TYPES plasma-applet.desktop) target_link_libraries(plasma_applet_%{APPNAMELC} Qt5::Gui diff --git a/tests/testengine/CMakeLists.txt b/tests/testengine/CMakeLists.txt index 69e89b21f..e9b1270ec 100644 --- a/tests/testengine/CMakeLists.txt +++ b/tests/testengine/CMakeLists.txt @@ -1,6 +1,9 @@ add_library(plasma_engine_testengine MODULE testengine.cpp) -kcoreaddons_desktop_to_json(plasma_engine_testengine plasma-dataengine-testengine.desktop) +kcoreaddons_desktop_to_json( + plasma_engine_testengine plasma-dataengine-testengine.desktop + SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/plasma/data/servicetypes/plasma-dataengine.desktop +) target_link_libraries(plasma_engine_testengine