From 5e10a8a5ca29077e977142724c050f2ea08ff1e5 Mon Sep 17 00:00:00 2001 From: Kevin Ottens <ervin@kde.org> Date: Mon, 20 Jul 2015 18:13:50 +0200 Subject: [PATCH 03/74] Use proper targets while linking --- calendarsupport/CMakeLists.txt | 4 ++-- calendarviews/CMakeLists.txt | 2 +- calendarviews/viewerapp/CMakeLists.txt | 2 +- console/calendarjanitor/CMakeLists.txt | 2 +- console/konsolekalendar/CMakeLists.txt | 2 +- incidenceeditor-ng/CMakeLists.txt | 6 +++--- kaddressbook/gravatar/autotests/CMakeLists.txt | 2 +- kaddressbook/merge/tests/CMakeLists.txt | 22 +++++++++++----------- kaddressbook/sendmail/tests/CMakeLists.txt | 2 +- kaddressbook/sendvcards/autotests/CMakeLists.txt | 2 +- kontact/plugins/korganizer/CMakeLists.txt | 4 ++-- kontact/plugins/specialdates/CMakeLists.txt | 2 +- korgac/CMakeLists.txt | 4 ++-- korgac/tests/CMakeLists.txt | 10 +++++----- korganizer/CMakeLists.txt | 6 +++--- mobile/lib/calendar/CMakeLists.txt | 2 +- mobile/mail/CMakeLists.txt | 2 +- .../messageviewer/bodypartformatter/CMakeLists.txt | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/calendarsupport/CMakeLists.txt b/calendarsupport/CMakeLists.txt index 4e04ddc1f1..591a9b16c1 100644 --- a/calendarsupport/CMakeLists.txt +++ b/calendarsupport/CMakeLists.txt @@ -71,7 +71,7 @@ target_link_libraries( ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ) set_target_properties(calendarsupport @@ -97,7 +97,7 @@ target_link_libraries( ${KDE4_KUTILS_LIBS} mailcommon pimcommon - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ) set_target_properties(calendarsupportcollectionpage diff --git a/calendarviews/CMakeLists.txt b/calendarviews/CMakeLists.txt index bcbcd30423..0b7de343ce 100644 --- a/calendarviews/CMakeLists.txt +++ b/calendarviews/CMakeLists.txt @@ -114,7 +114,7 @@ target_link_libraries(eventviews akonadi_next ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KCALUTILS_LIBS} - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ) set_target_properties(eventviews PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) diff --git a/calendarviews/viewerapp/CMakeLists.txt b/calendarviews/viewerapp/CMakeLists.txt index 14c77ac73e..e3c7de87f6 100644 --- a/calendarviews/viewerapp/CMakeLists.txt +++ b/calendarviews/viewerapp/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(viewerapp ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTGUI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") diff --git a/console/calendarjanitor/CMakeLists.txt b/console/calendarjanitor/CMakeLists.txt index 3de3bbcf3d..c0aeb62fe4 100644 --- a/console/calendarjanitor/CMakeLists.txt +++ b/console/calendarjanitor/CMakeLists.txt @@ -34,6 +34,6 @@ target_link_libraries(calendarjanitor ${KDEPIMLIBS_KCALCORE_LIBS} kdepim calendarsupport - akonadi-calendar) + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS}) install(TARGETS calendarjanitor ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/console/konsolekalendar/CMakeLists.txt b/console/konsolekalendar/CMakeLists.txt index d449fd15fd..b7c1a06988 100644 --- a/console/konsolekalendar/CMakeLists.txt +++ b/console/konsolekalendar/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries(konsolekalendar ${KDEPIMLIBS_KCALCORE_LIBS} kdepim calendarsupport - akonadi-calendar) + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS}) install(TARGETS konsolekalendar ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/incidenceeditor-ng/CMakeLists.txt b/incidenceeditor-ng/CMakeLists.txt index 9097780def..972cbf014e 100644 --- a/incidenceeditor-ng/CMakeLists.txt +++ b/incidenceeditor-ng/CMakeLists.txt @@ -89,7 +89,7 @@ kde4_add_ui_files(incidenceeditors_ng_desktop_LIB_SRCS kde4_add_library(incidenceeditorsng ${LIBRARY_TYPE} ${incidenceeditors_ng_desktop_LIB_SRCS}) target_link_libraries(incidenceeditorsng - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} @@ -132,7 +132,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS}) kde4_add_library(incidenceeditorsngmobile ${LIBRARY_TYPE} ${incidenceeditors_ng_mobile_LIB_SRCS}) target_link_libraries(incidenceeditorsngmobile - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} @@ -160,7 +160,7 @@ set(testincidenceeditor_SRCS main.cpp) kde4_add_executable(kincidenceeditor ${testincidenceeditor_SRCS}) target_link_libraries(kincidenceeditor - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} diff --git a/kaddressbook/gravatar/autotests/CMakeLists.txt b/kaddressbook/gravatar/autotests/CMakeLists.txt index 7d7247931c..56569c097e 100644 --- a/kaddressbook/gravatar/autotests/CMakeLists.txt +++ b/kaddressbook/gravatar/autotests/CMakeLists.txt @@ -7,7 +7,7 @@ set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE) set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE) add_akonadi_isolated_test_advanced( gravatarcreatejobtest.cpp "../job/gravatarcreatejob.cpp" "kaddressbookprivate;pimcommon") -add_akonadi_isolated_test_advanced( gravatarupdatejobtest.cpp "../job/gravatarupdatejob.cpp" "kaddressbookprivate;pimcommon;kabc") +add_akonadi_isolated_test_advanced( gravatarupdatejobtest.cpp "../job/gravatarupdatejob.cpp" "kaddressbookprivate;pimcommon;${KDEPIMLIBS_KABC_LIBRARY}") add_akonadi_isolated_test_advanced( gravatarcreatewidgettest.cpp "../widgets/gravatarcreatewidget.cpp" "kaddressbookprivate;pimcommon") add_akonadi_isolated_test_advanced( gravatarcreatedialogtest.cpp "../widgets/gravatarcreatedialog.cpp;../widgets/gravatarcreatewidget.cpp" "kaddressbookprivate;pimcommon") add_akonadi_isolated_test_advanced( gravatarupdatedialogtest.cpp "../widgets/gravatarupdatedialog.cpp;../widgets/gravatarupdatewidget.cpp" "kaddressbookprivate;pimcommon") diff --git a/kaddressbook/merge/tests/CMakeLists.txt b/kaddressbook/merge/tests/CMakeLists.txt index 8baebc3d8b..61ed0d29c7 100644 --- a/kaddressbook/merge/tests/CMakeLists.txt +++ b/kaddressbook/merge/tests/CMakeLists.txt @@ -16,23 +16,23 @@ include(AkonadiMacros) set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE) set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE) -add_akonadi_isolated_test_advanced(mergecontactwidgettest.cpp "../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;kaddressbookgrantlee;akonadi-contact;kabc") +add_akonadi_isolated_test_advanced(mergecontactwidgettest.cpp "../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;kaddressbookgrantlee;${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY};${KDEPIMLIBS_KABC_LIBRARY}") -add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "../widgets/mergecontactinfowidget.cpp" "akonadi-contact;kaddressbookgrantlee") +add_akonadi_isolated_test_advanced( mergecontactinfowidgettest.cpp "../widgets/mergecontactinfowidget.cpp" "${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY};kaddressbookgrantlee") add_akonadi_isolated_test_advanced( searchandmergecontactduplicatecontactdialogtest.cpp "" "kaddressbookprivate") -add_akonadi_isolated_test_advanced( searchduplicateresultwidgettest.cpp "" "kaddressbookprivate;kaddressbookgrantlee;kabc") -add_akonadi_isolated_test_advanced( resultduplicatetreewidgettest.cpp "" "kaddressbookprivate;kabc") -add_akonadi_isolated_test_advanced( searchpotentialduplicatecontactjobtest.cpp "../job/searchpotentialduplicatecontactjob.cpp" "kabc") -add_akonadi_isolated_test_advanced( mergecontactselectinformationwidgettest.cpp "" "kaddressbookprivate;kabc") -add_akonadi_isolated_test_advanced( mergecontactselectlistwidgettest.cpp "" "kaddressbookprivate;kabc") +add_akonadi_isolated_test_advanced( searchduplicateresultwidgettest.cpp "" "kaddressbookprivate;kaddressbookgrantlee;${KDEPIMLIBS_KABC_LIBRARY}") +add_akonadi_isolated_test_advanced( resultduplicatetreewidgettest.cpp "" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY}") +add_akonadi_isolated_test_advanced( searchpotentialduplicatecontactjobtest.cpp "../job/searchpotentialduplicatecontactjob.cpp" "${KDEPIMLIBS_KABC_LIBRARY}") +add_akonadi_isolated_test_advanced( mergecontactselectinformationwidgettest.cpp "" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY}") +add_akonadi_isolated_test_advanced( mergecontactselectlistwidgettest.cpp "" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY}") -add_akonadi_isolated_test_advanced( mergecontactselectinformationscrollareatest.cpp "../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;kabc;akonadi-contact;kaddressbookgrantlee") +add_akonadi_isolated_test_advanced( mergecontactselectinformationscrollareatest.cpp "../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY};${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY};kaddressbookgrantlee") -add_akonadi_isolated_test_advanced( mergecontactselectinformationtabwidgettest.cpp "" "kaddressbookprivate;kabc") +add_akonadi_isolated_test_advanced( mergecontactselectinformationtabwidgettest.cpp "" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY}") -add_akonadi_isolated_test_advanced(mergecontactsdialogtest.cpp "../manualmerge/mergecontactsdialog.cpp;../widgets/mergecontacterrorlabel.cpp;../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;kabc;akonadi-contact;kaddressbookgrantlee") -add_akonadi_isolated_test_advanced(mergecontactwidgetlisttest.cpp "../manualmerge/mergecontactwidgetlist.cpp;" "kaddressbookprivate;kabc;akonadi-contact") +add_akonadi_isolated_test_advanced(mergecontactsdialogtest.cpp "../manualmerge/mergecontactsdialog.cpp;../widgets/mergecontacterrorlabel.cpp;../widgets/mergecontactinfowidget.cpp" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY};${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY};kaddressbookgrantlee") +add_akonadi_isolated_test_advanced(mergecontactwidgetlisttest.cpp "../manualmerge/mergecontactwidgetlist.cpp;" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY};${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY}") set( kaddressbook_merge_mergecontactloseinformationwarning_source mergecontactloseinformationwarningtest.cpp ../widgets/mergecontactloseinformationwarning.cpp ) kde4_add_unit_test( mergecontactloseinformationwarningtest ${kaddressbook_merge_mergecontactloseinformationwarning_source}) diff --git a/kaddressbook/sendmail/tests/CMakeLists.txt b/kaddressbook/sendmail/tests/CMakeLists.txt index 6462d69aa9..307376ae7a 100644 --- a/kaddressbook/sendmail/tests/CMakeLists.txt +++ b/kaddressbook/sendmail/tests/CMakeLists.txt @@ -6,4 +6,4 @@ include(AkonadiMacros) set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE) set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE) -add_akonadi_isolated_test_advanced( mailsenderjobtest.cpp "../mailsenderjob.cpp" "kaddressbookprivate;kabc;akonadi-contact") +add_akonadi_isolated_test_advanced( mailsenderjobtest.cpp "../mailsenderjob.cpp" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY};${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY}") diff --git a/kaddressbook/sendvcards/autotests/CMakeLists.txt b/kaddressbook/sendvcards/autotests/CMakeLists.txt index c2025b4377..6696d7ff54 100644 --- a/kaddressbook/sendvcards/autotests/CMakeLists.txt +++ b/kaddressbook/sendvcards/autotests/CMakeLists.txt @@ -6,4 +6,4 @@ include(AkonadiMacros) set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE) set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE) -add_akonadi_isolated_test_advanced( sendvcardsjobtest.cpp "../sendvcardsjob.cpp" "kaddressbookprivate;kabc;akonadi-contact;pimcommon") +add_akonadi_isolated_test_advanced( sendvcardsjobtest.cpp "../sendvcardsjob.cpp" "kaddressbookprivate;${KDEPIMLIBS_KABC_LIBRARY};${KDEPIMLIBS_AKONADI_CONTACT_LIBRARY};pimcommon") diff --git a/kontact/plugins/korganizer/CMakeLists.txt b/kontact/plugins/korganizer/CMakeLists.txt index 790ab4f105..227602c88f 100644 --- a/kontact/plugins/korganizer/CMakeLists.txt +++ b/kontact/plugins/korganizer/CMakeLists.txt @@ -12,7 +12,7 @@ qt4_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/k kde4_add_plugin(kontact_korganizerplugin ${kontact_korganizerplugin_PART_SRCS}) -target_link_libraries(kontact_korganizerplugin akonadi-calendar ${KDEPIMLIBS_KCALUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} kdepim ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} korganizerprivate calendarsupport akonadi-calendar) +target_link_libraries(kontact_korganizerplugin ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDEPIMLIBS_KCALUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} kdepim ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} korganizerprivate calendarsupport) ########### next target ############### @@ -22,7 +22,7 @@ qt4_add_dbus_interfaces(kontact_todoplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korgani kde4_add_plugin(kontact_todoplugin ${kontact_todoplugin_PART_SRCS}) -target_link_libraries(kontact_todoplugin akonadi-calendar ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KABC_LIBS} kdepim ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KCALUTILS_LIBS} korganizerprivate calendarsupport akonadi-calendar) +target_link_libraries(kontact_todoplugin ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KABC_LIBS} kdepim ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KCALUTILS_LIBS} korganizerprivate calendarsupport) ########### next target ############### diff --git a/kontact/plugins/specialdates/CMakeLists.txt b/kontact/plugins/specialdates/CMakeLists.txt index 40aaf4fad6..97d494a6ea 100644 --- a/kontact/plugins/specialdates/CMakeLists.txt +++ b/kontact/plugins/specialdates/CMakeLists.txt @@ -16,7 +16,7 @@ if(BUILD_korganizer) endif() target_link_libraries(kontact_specialdatesplugin - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} diff --git a/korgac/CMakeLists.txt b/korgac/CMakeLists.txt index da757b723e..6ba0331296 100644 --- a/korgac/CMakeLists.txt +++ b/korgac/CMakeLists.txt @@ -73,8 +73,8 @@ else() endif() target_link_libraries(korgac - akonadi-calendar - akonadi-kmime + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} + ${KDEPIMLIBS_AKONADI_KMIME_LIBS} calendarsupport incidenceeditorsng kdepim diff --git a/korgac/tests/CMakeLists.txt b/korgac/tests/CMakeLists.txt index f9c391bc60..1f2ea6cc72 100644 --- a/korgac/tests/CMakeLists.txt +++ b/korgac/tests/CMakeLists.txt @@ -18,14 +18,14 @@ qt4_add_dbus_interface(testalarmdlg_SRCS ${korganizer_xml} kde4_add_executable(testalarmdlg TEST ${testalarmdlg_SRCS}) target_link_libraries(testalarmdlg - akonadi-calendar - akonadi-kmime + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} + ${KDEPIMLIBS_AKONADI_KMIME_LIBS} calendarsupport incidenceeditorsng kdepimdbusinterfaces - kio - kmime - kpimutils + ${KDE4_KIO_LIBS} + ${KDEPIMLIBS_KMIME_LIBS} + ${KDEPIMLIBS_KPIMUTILS_LIBS} korganizer_core ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index bcbba42fee..144ea59150 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -66,7 +66,7 @@ if(KDEPIM_BUILD_DESKTOP) korganizer_interfaces korganizer_core calendarsupport - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ) install(TARGETS @@ -84,7 +84,7 @@ if(KDEPIM_BUILD_DESKTOP) kde4_add_plugin(kcm_korganizer ${kcm_korganizer_PART_SRCS}) target_link_libraries(kcm_korganizer - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} calendarsupport eventviews incidenceeditorsng @@ -246,7 +246,7 @@ set(korganizerprivate_LIB_SRCS target_link_libraries(korganizerprivate pimcommon akonadi_next - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} calendarsupport eventviews incidenceeditorsng diff --git a/mobile/lib/calendar/CMakeLists.txt b/mobile/lib/calendar/CMakeLists.txt index f23ec77515..39d526f10e 100644 --- a/mobile/lib/calendar/CMakeLists.txt +++ b/mobile/lib/calendar/CMakeLists.txt @@ -29,7 +29,7 @@ kde4_add_library(kdepimmobileuicalendar STATIC ${mobileui_calendar_SRCS}) target_link_libraries(kdepimmobileuicalendar ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} akonadi_next incidenceeditorsngmobile calendarsupport diff --git a/mobile/mail/CMakeLists.txt b/mobile/mail/CMakeLists.txt index b1423a541d..e7d73e8f7a 100644 --- a/mobile/mail/CMakeLists.txt +++ b/mobile/mail/CMakeLists.txt @@ -82,7 +82,7 @@ target_link_libraries(kmail-mobile ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KMBOX_LIBS} - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} akonadi_next kdepim kdepimmobileui diff --git a/plugins/messageviewer/bodypartformatter/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/CMakeLists.txt index 2383bcd899..8558ab342d 100644 --- a/plugins/messageviewer/bodypartformatter/CMakeLists.txt +++ b/plugins/messageviewer/bodypartformatter/CMakeLists.txt @@ -31,7 +31,7 @@ kde4_add_plugin(messageviewer_bodypartformatter_text_calendar ${messageviewer_bo target_link_libraries(messageviewer_bodypartformatter_text_calendar - akonadi-calendar + ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} -- 2.14.1