summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-13 05:29:52 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-13 05:29:52 (GMT)
commit4f2df12fe8bca9c566079d53fc05845aa4953025 (patch)
treed96a8c86e9593be77ac1145f2feb025f590f36a4
parentbf0eb6ae9aaeaf9822e1d93850d783e0a1fb3ccb (diff)
Port to new macro
-rw-r--r--kmail/plugins/antispamplugin/CMakeLists.txt5
-rw-r--r--kmail/plugins/antivirusplugin/CMakeLists.txt6
2 files changed, 4 insertions, 7 deletions
diff --git a/kmail/plugins/antispamplugin/CMakeLists.txt b/kmail/plugins/antispamplugin/CMakeLists.txt
index 9afbadb..2a2eda8 100644
--- a/kmail/plugins/antispamplugin/CMakeLists.txt
+++ b/kmail/plugins/antispamplugin/CMakeLists.txt
@@ -4,13 +4,12 @@ set(kmail_antispamplugin_SRCS
../common/antispamwizard.cpp
)
-add_library(kmail_antispamplugin MODULE ${kmail_antispamplugin_SRCS})
-
+kcoreaddons_add_plugin(kmail_antispamplugin JSON kmail_antispamplugin.json SOURCES
+ ${kmail_antispamplugin_SRCS} INSTALL_NAMESPACE kmail)
target_link_libraries(kmail_antispamplugin
KF5::PimCommon KF5::Completion KF5::IconThemes KF5::MailCommon KF5::XmlGui KF5::Libkdepim KF5::I18n
)
-install(TARGETS kmail_antispamplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kmail)
if(BUILD_TESTING)
add_subdirectory(autotests)
diff --git a/kmail/plugins/antivirusplugin/CMakeLists.txt b/kmail/plugins/antivirusplugin/CMakeLists.txt
index bef8008..78128d6 100644
--- a/kmail/plugins/antivirusplugin/CMakeLists.txt
+++ b/kmail/plugins/antivirusplugin/CMakeLists.txt
@@ -4,14 +4,12 @@ set(kmail_antivirusplugin_SRCS
../common/antispamwizard.cpp
)
-add_library(kmail_antivirusplugin MODULE ${kmail_antivirusplugin_SRCS})
+kcoreaddons_add_plugin(kmail_antivirusplugin JSON kmail_antivirusplugin.json SOURCES
+ ${kmail_antivirusplugin_SRCS} INSTALL_NAMESPACE kmail)
target_link_libraries(kmail_antivirusplugin
KF5::PimCommon KF5::Completion KF5::IconThemes KF5::MailCommon KF5::XmlGui KF5::Libkdepim KF5::I18n
)
-
-install(TARGETS kmail_antivirusplugin DESTINATION ${PLUGIN_INSTALL_DIR}/kmail)
-
if(BUILD_TESTING)
add_subdirectory(autotests)
endif()