Clean up lib + add macro for autotests

agents/mailmergeagent/CMakeLists.txt

@@ -37,10 +37,9 @@ target_link_libraries(mailmergeagent
     KF5::AkonadiCore
     KF5::AkonadiMime
     KF5::MailTransportAkonadi
-    KF5::Mime
+    #KF5::Mime
     KF5::MessageComposer
     KF5::MessageCore
-    KF5::PimCommon
     KF5::DBusAddons
     KF5::WindowSystem
     KF5::XmlGui

agents/mailmergeagent/autotests/CMakeLists.txt

+# Convenience macro to add unit tests.
+macro( mailmerge_agent _source )
+    set( _test ${_source})
+    get_filename_component( _name ${_source} NAME_WE )
+    ecm_add_test(${_test}
+        TEST_NAME ${_name}
+        NAME_PREFIX "mailmerge-"
+        LINK_LIBRARIES mailmergeagent Qt::Test KF5::AkonadiCore Qt::Widgets KF5::I18n KF5::XmlGui KF5::Service
+        )
+endmacro()