Use more target centric cmake

kaddressbook/plugins/checkgravatar/CMakeLists.txt

@@ -2,16 +2,13 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
-set(kaddressbook_gravatar_SRCS
+set(kaddressbook_checkgravatarplugin_SRCS
     gravatar/job/gravatarupdatejob.cpp
     gravatar/widgets/gravatarupdatedialog.cpp
     gravatar/widgets/gravatarupdatewidget.cpp
-    )
 
-set(kaddressbook_checkgravatarplugin_SRCS
     checkgravatarplugininterface.cpp
     checkgravatarplugin.cpp
-    ${kaddressbook_gravatar_SRCS}
     )
 
 ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME org.kde.pim.kaddressbook_checkgravatar

kaddressbook/plugins/mergelib/CMakeLists.txt

-set(kaddressbookmergelibprivate_SRCS
+add_library(kaddressbookmergelibprivate)
+
+target_sources(kaddressbookmergelibprivate PRIVATE
     job/searchpotentialduplicatecontactjob.cpp
     job/mergecontactsjob.cpp
     job/mergecontacts.cpp
@@ -20,12 +22,11 @@ set(kaddressbookmergelibprivate_SRCS
     widgets/mergecontactselectinformationscrollarea.cpp
     widgets/mergecontacterrorlabel.cpp
     )
-ecm_qt_declare_logging_category(kaddressbookmergelibprivate_SRCS HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME org.kde.pim.kaddressbookmergelibprivate
+ecm_qt_declare_logging_category(kaddressbookmergelibprivate HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME org.kde.pim.kaddressbookmergelibprivate
     DESCRIPTION "kdepim-addons (kaddressbook merge contact plugin)"
     EXPORT KDEPIMADDONS
     )
 
-add_library(kaddressbookmergelibprivate ${kaddressbookmergelibprivate_SRCS})
 generate_export_header(kaddressbookmergelibprivate BASE_NAME kaddressbookmergelib)
 if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(kaddressbookmergelibprivate PROPERTIES UNITY_BUILD ON)

kmail/grammarplugins/grammalecte/src/CMakeLists.txt

-set(kmailgrammalecte_SRCS
+add_library(kmailgrammalecte ${kmailgrammalecte_SRCS})
+
+target_sources(kmailgrammalecte PRIVATE
     grammalecteparser.cpp
     grammalecteresultjob.cpp
     grammalecteconfigwidget.cpp
@@ -9,14 +11,13 @@ set(kmailgrammalecte_SRCS
     grammalectegrammarerror.cpp
     )
 
-ecm_qt_declare_logging_category(kmailgrammalecte_SRCS HEADER libgrammalecte_debug.h IDENTIFIER LIBGRAMMALECTE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libgrammalecteplugin
+ecm_qt_declare_logging_category(kmailgrammalecte HEADER libgrammalecte_debug.h IDENTIFIER LIBGRAMMALECTE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libgrammalecteplugin
     DESCRIPTION "kdepim-addons (libgramalecte)"
     EXPORT KDEPIMADDONS
     )
 
 
 
-add_library(kmailgrammalecte ${kmailgrammalecte_SRCS})
 if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(kmail_confirmaddresseditorplugin PROPERTIES UNITY_BUILD ON)
 endif()

kmail/grammarplugins/grammalecte/tests/CMakeLists.txt

-set(grammalecte_gui_SRCS main.cpp grammalectewidget.cpp)
 add_executable(grammalecte_gui ${grammalecte_gui_SRCS})
+target_sources(grammalecte_gui PRIVATE main.cpp grammalectewidget.cpp)
 target_link_libraries(grammalecte_gui
     KF5::I18n kmailgrammalecte grammarcommon
 )

plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt

 
 
 add_definitions(-DTRANSLATION_DOMAIN=\"messageviewer_text_calendar_plugin\")
-add_library(messageviewer_bodypartformatter_text_calendar MODULE ${messageviewer_bodypartformatter_text_calendar_PART_SRCS})
+add_library(messageviewer_bodypartformatter_text_calendar MODULE)
 
 qt_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS
     korganizer/org.kde.Korganizer.Calendar.xml

plugins/messageviewerconfigureplugins/dkim-verify/CMakeLists.txt

@@ -12,7 +12,8 @@ target_link_libraries(messageviewer_dkimconfigplugin
     )
 
 
-set(dkimverifyconfigure_SRCS
+add_library(dkimverifyconfigure)
+target_sources(dkimverifyconfigure PRIVATE
     dkimconfiguredialog.cpp
     dkimconfiguretab.cpp
     dkimconfigurewidget.cpp
@@ -24,12 +25,11 @@ set(dkimverifyconfigure_SRCS
     dkimauthenticationverifiedserverdialog.cpp
     )
 
-ecm_qt_declare_logging_category(dkimverifyconfigure_SRCS HEADER libdkimverifyconfigure_debug.h IDENTIFIER LIBDKIMVERIFYCONFIGURE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libdkimconfigureplugin
+ecm_qt_declare_logging_category(dkimverifyconfigure HEADER libdkimverifyconfigure_debug.h IDENTIFIER LIBDKIMVERIFYCONFIGURE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libdkimconfigureplugin
     DESCRIPTION "kdepim-addons (dkim-verify-configure)"
     EXPORT KDEPIMADDONS
     )
 
-add_library(dkimverifyconfigure ${dkimverifyconfigure_SRCS})
 if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(dkimverifyconfigure PROPERTIES UNITY_BUILD ON)
 endif()

plugins/messageviewerconfigureplugins/expireaccounttrashfolder/CMakeLists.txt

-set(expireaccounttrashfolderconfig_SRCS
+add_library(expireaccounttrashfolderconfig)
+target_sources(expireaccounttrashfolderconfig PRIVATE
     expireaccounttrashfolderconfigdialog.cpp
     expireaccounttrashfolderconfigwidget.cpp
 
     )
 
-ecm_qt_declare_logging_category(expireaccounttrashfolderconfig_SRCS HEADER libexpireaccounttrashfolderconfig_debug.h IDENTIFIER LIBEXPIREACCOUNTTRASHFOLDERCONFIG_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libexpireaccounttrashfolderconfig
+ecm_qt_declare_logging_category(expireaccounttrashfolderconfig HEADER libexpireaccounttrashfolderconfig_debug.h IDENTIFIER LIBEXPIREACCOUNTTRASHFOLDERCONFIG_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libexpireaccounttrashfolderconfig
     DESCRIPTION "kdepim-addons (expire account trash folder config)"
     EXPORT KDEPIMADDONS
     )
 
-add_library(expireaccounttrashfolderconfig ${expireaccounttrashfolderconfig_SRCS})
 if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(expireaccounttrashfolderconfig PROPERTIES UNITY_BUILD ON)
 endif()

plugins/messageviewerconfigureplugins/foldersettings/CMakeLists.txt

+add_library(folderconfiguresettings)
 
-set(folderconfiguresettings_SRCS
+target_sources(folderconfiguresettings PRIVATE
     folderconfiguresettingsdialog.cpp
     folderconfiguresettingswidget.cpp
     foldersettingfilterproxymodel.cpp
@@ -13,12 +14,11 @@ set(folderconfiguresettings_SRCS
     folderconfiguresettingsexperywidget.cpp
     )
 
-ecm_qt_declare_logging_category(folderconfiguresettings_SRCS HEADER libfolderconfiguresettings_debug.h IDENTIFIER LIBFOLDERCONFIGURESETTINGS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libfolderconfiguresettingsplugin
+ecm_qt_declare_logging_category(folderconfiguresettings HEADER libfolderconfiguresettings_debug.h IDENTIFIER LIBFOLDERCONFIGURESETTINGS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.libfolderconfiguresettingsplugin
     DESCRIPTION "kdepim-addons (foldersettings-configure)"
     EXPORT KDEPIMADDONS
     )
 
-add_library(folderconfiguresettings ${folderconfiguresettings_SRCS})
 if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(folderconfiguresettings PROPERTIES UNITY_BUILD ON)
 endif()