summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-12 21:21:49 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-12 21:21:49 (GMT)
commitbf0eb6ae9aaeaf9822e1d93850d783e0a1fb3ccb (patch)
tree388a432ab5d6d5004510c047355bff32ae1dc722
parent3c96313076d6158397cab51de6026debb7d0a765 (diff)
Use kcoreaddons macro for plugins
-rw-r--r--kaddressbook/plugins/checkgravatar/CMakeLists.txt5
-rw-r--r--kaddressbook/plugins/mergecontacts/CMakeLists.txt6
2 files changed, 5 insertions, 6 deletions
diff --git a/kaddressbook/plugins/checkgravatar/CMakeLists.txt b/kaddressbook/plugins/checkgravatar/CMakeLists.txt
index d9836f2..8e2db08 100644
--- a/kaddressbook/plugins/checkgravatar/CMakeLists.txt
+++ b/kaddressbook/plugins/checkgravatar/CMakeLists.txt
@@ -16,14 +16,13 @@ set(kaddressbook_checkgravatarplugin_SRCS
ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME log_kaddressbook_checkgravatar)
-add_library(kaddressbook_checkgravatarplugin MODULE ${kaddressbook_checkgravatarplugin_SRCS})
+kcoreaddons_add_plugin(kaddressbook_checkgravatarplugin JSON kaddressbook_checkgravatarplugin.json SOURCES
+ ${kaddressbook_checkgravatarplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
target_link_libraries(kaddressbook_checkgravatarplugin
KF5::PimCommon KF5::Completion KF5::IconThemes KF5::MailCommon KF5::XmlGui KF5::Gravatar KF5::I18n
)
-install(TARGETS kaddressbook_checkgravatarplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kaddressbook)
-
if (BUILD_TESTING)
add_subdirectory(gravatar/autotests)
add_subdirectory(gravatar/tests)
diff --git a/kaddressbook/plugins/mergecontacts/CMakeLists.txt b/kaddressbook/plugins/mergecontacts/CMakeLists.txt
index 0adb630..c10ffc0 100644
--- a/kaddressbook/plugins/mergecontacts/CMakeLists.txt
+++ b/kaddressbook/plugins/mergecontacts/CMakeLists.txt
@@ -3,10 +3,10 @@ set(kaddressbook_mergecontactsplugin_SRCS
mergecontactsplugin.cpp
)
-add_library(kaddressbook_mergecontactsplugin MODULE ${kaddressbook_mergecontactsplugin_SRCS})
+
+kcoreaddons_add_plugin(kaddressbook_mergecontactsplugin JSON kaddressbook_mergecontactsplugin.json SOURCES
+ ${kaddressbook_mergecontactsplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
target_link_libraries(kaddressbook_mergecontactsplugin
KF5::PimCommon KF5::Completion KF5::IconThemes KF5::MailCommon KF5::XmlGui kaddressbookmergelibprivate KF5::I18n
)
-
-install(TARGETS kaddressbook_mergecontactsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kaddressbook)