summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-23 10:30:37 +0200
committerMontel Laurent <[email protected]>2015-08-23 10:30:52 +0200
commitfa303cc8b8d10ccb15356e5de801e85514169f3f (patch)
treedf2ea4a962137778d5597bc1a5538dbc92e73c21
parenta24eb65c9690f33b92d2f8762ac6111059969388 (diff)
Reduce dependancy
-rw-r--r--agents/archivemailagent/CMakeLists.txt1
-rw-r--r--agents/mailfilteragent/CMakeLists.txt1
-rw-r--r--agents/sendlateragent/CMakeLists.txt2
-rw-r--r--examples/mailreader/CMakeLists.txt2
-rw-r--r--kmail/CMakeLists.txt1
-rw-r--r--kmail/autotests/CMakeLists.txt2
-rw-r--r--kmail/kcm_kpimidentities/CMakeLists.txt2
-rw-r--r--mailcommon/CMakeLists.txt2
-rw-r--r--mailcommon/collectionpage/autotests/CMakeLists.txt2
-rw-r--r--mailcommon/filter/autotests/CMakeLists.txt2
-rw-r--r--mboximporter/CMakeLists.txt1
-rw-r--r--messagecomposer/CMakeLists.txt1
-rw-r--r--messagecomposer/autotests/CMakeLists.txt1
-rw-r--r--messagecore/CMakeLists.txt9
-rw-r--r--messagecore/autotests/CMakeLists.txt4
-rw-r--r--messagelist/CMakeLists.txt2
-rw-r--r--messagelist/autotests/CMakeLists.txt2
-rw-r--r--pimsettingexporter/console/CMakeLists.txt2
-rw-r--r--pimsettingexporter/core/CMakeLists.txt1
-rw-r--r--pimsettingexporter/core/tests/CMakeLists.txt2
-rw-r--r--pimsettingexporter/gui/CMakeLists.txt1
-rw-r--r--templateparser/CMakeLists.txt2
-rw-r--r--templateparser/autotests/CMakeLists.txt2
23 files changed, 33 insertions, 14 deletions
diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
index 4924bd5..9dea822 100644
--- a/agents/archivemailagent/CMakeLists.txt
+++ b/agents/archivemailagent/CMakeLists.txt
@@ -42,6 +42,7 @@ target_link_libraries(akonadi_archivemail_agent
KF5::Notifications
mailcommon
kdepim
+ KF5::IconThemes
)
if( APPLE )
diff --git a/agents/mailfilteragent/CMakeLists.txt b/agents/mailfilteragent/CMakeLists.txt
index 9477343..3c7cd22 100644
--- a/agents/mailfilteragent/CMakeLists.txt
+++ b/agents/mailfilteragent/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries(akonadi_mailfilter_agent
KF5::DBusAddons
KF5::Notifications
KF5::WindowSystem
+ KF5::IconThemes
)
install(TARGETS akonadi_mailfilter_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/agents/sendlateragent/CMakeLists.txt b/agents/sendlateragent/CMakeLists.txt
index ea78924..92c0f29 100644
--- a/agents/sendlateragent/CMakeLists.txt
+++ b/agents/sendlateragent/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(sendlater
KF5::ConfigGui
Qt5::DBus
Qt5::Widgets
+ KF5::IconThemes
)
target_include_directories(sendlater PUBLIC "$<BUILD_INTERFACE:${sendlateragent_SOURCE_DIR};${sendlateragent_BINARY_DIR}>")
set_target_properties( sendlater PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION} )
@@ -71,6 +72,7 @@ target_link_libraries(akonadi_sendlater_agent
KF5::WindowSystem
KF5::XmlGui
KF5::Notifications
+ KF5::IconThemes
)
if( APPLE )
diff --git a/examples/mailreader/CMakeLists.txt b/examples/mailreader/CMakeLists.txt
index 46b479b..6855361 100644
--- a/examples/mailreader/CMakeLists.txt
+++ b/examples/mailreader/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(akonadimailreader
KF5::AkonadiMime
KF5::AkonadiCore
KF5::XmlGui
-
+ KF5::IconThemes
kdepim
kleo
kpgp
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 6d758a9..3856eb5 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -302,6 +302,7 @@ target_link_libraries(kmailprivate
sendlater
followupreminder
grantleetheme
+ KF5::IconThemes
)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:messagelist,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:messageviewer,INTERFACE_INCLUDE_DIRECTORIES>)
diff --git a/kmail/autotests/CMakeLists.txt b/kmail/autotests/CMakeLists.txt
index 6f3039b..9872bb0 100644
--- a/kmail/autotests/CMakeLists.txt
+++ b/kmail/autotests/CMakeLists.txt
@@ -33,7 +33,7 @@ set( kmail_cryptostateindicatorwidgettest_source cryptostateindicatorwidgettest.
add_executable( cryptostateindicatorwidgettest ${kmail_cryptostateindicatorwidgettest_source})
add_test(cryptostateindicatorwidgettest cryptostateindicatorwidgettest)
ecm_mark_as_test(cryptostateindicatorwidgettest)
-target_link_libraries( cryptostateindicatorwidgettest Qt5::Test messagecore)
+target_link_libraries( cryptostateindicatorwidgettest Qt5::Test messagecore Qt5::Widgets KF5::ConfigWidgets KF5::I18n)
set( kmail_kactionmenutransporttest_source kactionmenutransporttest.cpp ../widgets/kactionmenutransport.cpp)
diff --git a/kmail/kcm_kpimidentities/CMakeLists.txt b/kmail/kcm_kpimidentities/CMakeLists.txt
index 9702e59..74bfe1c 100644
--- a/kmail/kcm_kpimidentities/CMakeLists.txt
+++ b/kmail/kcm_kpimidentities/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(kcm_kpimidentities
KF5::KCMUtils
KF5::KIOCore
KF5::KIOWidgets
-
+ KF5::IconThemes
mailcommon
messagecomposer
messageviewer
diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt
index 2f9e943..0859b2e 100644
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@ -221,6 +221,8 @@ PRIVATE
KF5::XmlGui
KF5::KIOWidgets
KF5::WindowSystem
+ KF5::IconThemes
+ KF5::Archive
)
target_include_directories(mailcommon PUBLIC "$<BUILD_INTERFACE:${mailcommon_SOURCE_DIR};${mailcommon_BINARY_DIR}>")
diff --git a/mailcommon/collectionpage/autotests/CMakeLists.txt b/mailcommon/collectionpage/autotests/CMakeLists.txt
index 6449d04..622d4b8 100644
--- a/mailcommon/collectionpage/autotests/CMakeLists.txt
+++ b/mailcommon/collectionpage/autotests/CMakeLists.txt
@@ -2,7 +2,7 @@ macro(add_mailcommon_collectionpage_test _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-collectionpage-"
- LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore mailcommon
+ LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore mailcommon KF5::Completion
)
endmacro()
diff --git a/mailcommon/filter/autotests/CMakeLists.txt b/mailcommon/filter/autotests/CMakeLists.txt
index c20d9ab..af0e5fe 100644
--- a/mailcommon/filter/autotests/CMakeLists.txt
+++ b/mailcommon/filter/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ macro(add_mailcommon_filter_test _name)
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-filter-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::AkonadiMime
- kdepim mailcommon pimcommon Phonon::phonon4qt5 KF5::KIOWidgets
+ kdepim mailcommon pimcommon Phonon::phonon4qt5 KF5::KIOWidgets KF5::IconThemes
)
endmacro()
diff --git a/mboximporter/CMakeLists.txt b/mboximporter/CMakeLists.txt
index 7446033..09d271c 100644
--- a/mboximporter/CMakeLists.txt
+++ b/mboximporter/CMakeLists.txt
@@ -23,6 +23,7 @@ PRIVATE
KF5::IdentityManagement
mailimporter
mailcommon
+ KF5::Completion
)
install(TARGETS mboximporter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/messagecomposer/CMakeLists.txt b/messagecomposer/CMakeLists.txt
index 497a900..7c8b3e3 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@ -173,6 +173,7 @@ PRIVATE
Grantlee5::TextDocument
sendlater
followupreminder
+ KF5::Archive
)
target_include_directories(messagecomposer PUBLIC "$<BUILD_INTERFACE:${messagecomposer_SOURCE_DIR};${messagecomposer_BINARY_DIR}>")
diff --git a/messagecomposer/autotests/CMakeLists.txt b/messagecomposer/autotests/CMakeLists.txt
index 6a00599..98eb902 100644
--- a/messagecomposer/autotests/CMakeLists.txt
+++ b/messagecomposer/autotests/CMakeLists.txt
@@ -30,6 +30,7 @@ macro( add_messagecomposer_cryptotest _source )
KF5::AkonadiCore
Qt5::Test
KF5::QGpgme
+ KF5::IconThemes
)
add_gpg_crypto_test(${_name} ${_name})
endmacro()
diff --git a/messagecore/CMakeLists.txt b/messagecore/CMakeLists.txt
index d8f32f1..eb87ec9 100644
--- a/messagecore/CMakeLists.txt
+++ b/messagecore/CMakeLists.txt
@@ -60,6 +60,10 @@ add_library(messagecore ${messagecore_LIB_SRCS})
generate_export_header(messagecore BASE_NAME messagecore)
target_link_libraries(messagecore
+PUBLIC
+ KF5::Mime
+ KF5::KIOCore
+PRIVATE
KF5::Mime
KF5::KIOCore
KF5::Codecs
@@ -73,11 +77,6 @@ target_link_libraries(messagecore
Qt5::Network
)
-target_link_libraries(messagecore LINK_INTERFACE_LIBRARIES
- KF5::Mime
- KF5::KIOCore
-)
-
target_include_directories(messagecore PUBLIC "$<BUILD_INTERFACE:${messagecore_SOURCE_DIR};${messagecore_BUILD_DIR};${Boost_INCLUDE_DIRS}>")
diff --git a/messagecore/autotests/CMakeLists.txt b/messagecore/autotests/CMakeLists.txt
index f3c0001..6debbd0 100644
--- a/messagecore/autotests/CMakeLists.txt
+++ b/messagecore/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@ macro(add_messagecore_test _source )
add_definitions(-DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
ecm_add_test(${_source}
NAME_PREFIX "messagecore-"
- LINK_LIBRARIES Qt5::Test kleo messagecore
+ LINK_LIBRARIES Qt5::Test kleo messagecore Qt5::Widgets KF5::Archive KF5::Completion
)
endmacro()
@@ -24,5 +24,5 @@ add_messagecore_test( mailinglisttest.cpp )
ecm_add_test(mdnstateattributetest.cpp ../misc/mdnstateattribute.cpp
TEST_NAME msdnattributetest
NAME_PREFIX "messagecore-"
- LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore messagecore
+ LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore messagecore
)
diff --git a/messagelist/CMakeLists.txt b/messagelist/CMakeLists.txt
index e3304cd..b9779e5 100644
--- a/messagelist/CMakeLists.txt
+++ b/messagelist/CMakeLists.txt
@@ -97,6 +97,8 @@ target_link_libraries(messagelist
pimcommon
KF5::AkonadiSearchPIM
KF5::XmlGui
+ KF5::IconThemes
+ KF5::Completion
)
target_include_directories(messagelist PUBLIC "$<BUILD_INTERFACE:${messagelist_SOURCE_DIR};${messagelist_BINARY_DIR}>")
diff --git a/messagelist/autotests/CMakeLists.txt b/messagelist/autotests/CMakeLists.txt
index 0a28a0b..682b1bc 100644
--- a/messagelist/autotests/CMakeLists.txt
+++ b/messagelist/autotests/CMakeLists.txt
@@ -4,7 +4,7 @@ macro(messagelist_unittest _source)
ecm_add_test(${_source} ../messagelist_debug.cpp
TEST_NAME ${_name}
NAME_PREFIX "messagelist-"
- LINK_LIBRARIES Qt5::Test messagecore messagelist pimcommon
+ LINK_LIBRARIES Qt5::Test messagecore messagelist pimcommon KF5::Completion
)
endmacro ()
diff --git a/pimsettingexporter/console/CMakeLists.txt b/pimsettingexporter/console/CMakeLists.txt
index 9f9a36d..5b043ee 100644
--- a/pimsettingexporter/console/CMakeLists.txt
+++ b/pimsettingexporter/console/CMakeLists.txt
@@ -19,7 +19,7 @@ set(pimsettingexporterconsole_SRCS
add_executable(pimsettingexporterconsole ${pimsettingexporterconsole_SRCS})
-target_link_libraries(pimsettingexporterconsole KF5::ConfigCore Qt5::Xml KF5::CoreAddons KF5::I18n
+target_link_libraries(pimsettingexporterconsole KF5::ConfigCore Qt5::Xml KF5::CoreAddons KF5::I18n KF5::Archive
pimsettingexporterprivate
)
if (BUILD_TESTING)
diff --git a/pimsettingexporter/core/CMakeLists.txt b/pimsettingexporter/core/CMakeLists.txt
index 6dfa05b..b752645 100644
--- a/pimsettingexporter/core/CMakeLists.txt
+++ b/pimsettingexporter/core/CMakeLists.txt
@@ -79,6 +79,7 @@ PRIVATE
KF5::MailTransport
KF5::AlarmCalendar
mailcommon
+ KF5::Archive
)
set_target_properties(pimsettingexporterprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
diff --git a/pimsettingexporter/core/tests/CMakeLists.txt b/pimsettingexporter/core/tests/CMakeLists.txt
index 4bb1bff..924b75f 100644
--- a/pimsettingexporter/core/tests/CMakeLists.txt
+++ b/pimsettingexporter/core/tests/CMakeLists.txt
@@ -6,6 +6,7 @@ target_link_libraries(selectiontreewidget_gui
KF5::AkonadiPrivate
mailcommon
pimcommon
+ KF5::Archive
)
set(showarchivestructuredialog_gui_SRCS showarchivestructuredialog_gui.cpp ../../gui/dialog/showarchivestructuredialog.cpp ../utils.cpp ../xml/templateselection.cpp ../pimsettingexportcore_debug.cpp ../../gui/pimsettingexportgui_debug.cpp)
@@ -15,4 +16,5 @@ target_link_libraries(showarchivestructuredialog_gui
KF5::AkonadiPrivate
mailcommon
pimcommon
+ KF5::Archive
)
diff --git a/pimsettingexporter/gui/CMakeLists.txt b/pimsettingexporter/gui/CMakeLists.txt
index bdd30a4..6a55ece 100644
--- a/pimsettingexporter/gui/CMakeLists.txt
+++ b/pimsettingexporter/gui/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries(pimsettingexporter
pimcommon
kdepim
pimsettingexporterprivate
+ KF5::Archive
)
add_subdirectory(kconf_update)
diff --git a/templateparser/CMakeLists.txt b/templateparser/CMakeLists.txt
index 40d419c..7ad6dce 100644
--- a/templateparser/CMakeLists.txt
+++ b/templateparser/CMakeLists.txt
@@ -51,6 +51,8 @@ PRIVATE
messagecore
Qt5::WebKitWidgets
KF5::XmlGui
+ KF5::IconThemes
+ KF5::Completion
)
set_target_properties(templateparser PROPERTIES
VERSION ${KDEPIM_LIB_VERSION}
diff --git a/templateparser/autotests/CMakeLists.txt b/templateparser/autotests/CMakeLists.txt
index 64878c0..090141e 100644
--- a/templateparser/autotests/CMakeLists.txt
+++ b/templateparser/autotests/CMakeLists.txt
@@ -23,6 +23,8 @@ macro(add_templateparser_unittest _source)
KF5::AkonadiCore
KF5::IdentityManagement
KF5::XmlGui
+ KF5::Completion
+ KF5::IconThemes
)
add_gpg_crypto_test(${_name} templateparser-${_name})
endmacro()