From 1eb6c6acadb9319a33330033e9a7dcef51c71d9e Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 28 Apr 2014 20:11:54 +0200 Subject: [PATCH] Fix includes --- resources/CMakeLists.txt | 8 +++++++- resources/maildir/libmaildir/maildir.cpp | 2 +- resources/maildir/maildirresource.cpp | 2 +- resources/nntp/nntpresource.cpp | 2 +- resources/pop3/accountdialog.cpp | 4 ++-- resources/pop3/pop3resource.cpp | 6 +++--- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index f521da3a8..b47c91953 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -16,6 +16,10 @@ include(KDEFrameworkCompilerSettings) set(KF5_VERSION "4.98.0") set(QT_REQUIRED_VERSION "5.2.0") +set(KDEPIM_LIB_VERSION "4.70.0") +set(KDEPIM_LIB_SOVERSION "5") + + find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${KF5_VERSION} CONFIG REQUIRED) @@ -25,6 +29,7 @@ find_package(KF5Abc ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiMime ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5PimIdentities ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5MailTransport ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5Mime ${KF5_VERSION} CONFIG REQUIRED) # Xsltproc @@ -62,6 +67,7 @@ include_directories( ${kdepim-runtime_SOURCE_DIR}/libkdepim-copy ${CMAKE_CURRENT_SOURCE_DIR}/shared ${CMAKE_CURRENT_BINARY_DIR}/shared + ${CMAKE_CURRENT_SOURCE_DIR}/folderarchivesettings/ ) @@ -101,7 +107,7 @@ set( AKONADI_IMAPATTRIBUTES_SHARED_SOURCES #add_subdirectory( contacts ) add_subdirectory( dav ) #add_subdirectory( ical ) -#add_subdirectory( imap ) +add_subdirectory( imap ) add_subdirectory( kdeaccounts ) #if (Libkolab_FOUND AND Libkolabxml_FOUND) # add_subdirectory( kolabproxy ) diff --git a/resources/maildir/libmaildir/maildir.cpp b/resources/maildir/libmaildir/maildir.cpp index 0531438b2..0e4606a8e 100644 --- a/resources/maildir/libmaildir/maildir.cpp +++ b/resources/maildir/libmaildir/maildir.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/resources/maildir/maildirresource.cpp b/resources/maildir/maildirresource.cpp index aeed1d133..27773fc4b 100644 --- a/resources/maildir/maildirresource.cpp +++ b/resources/maildir/maildirresource.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/resources/nntp/nntpresource.cpp b/resources/nntp/nntpresource.cpp index 8f8d17d40..de236dad6 100644 --- a/resources/nntp/nntpresource.cpp +++ b/resources/nntp/nntpresource.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/resources/pop3/accountdialog.cpp b/resources/pop3/accountdialog.cpp index 682902f60..5966e276a 100644 --- a/resources/pop3/accountdialog.cpp +++ b/resources/pop3/accountdialog.cpp @@ -29,8 +29,8 @@ // KDEPIMLIBS includes #include #include -#include -#include +#include +#include #include #include diff --git a/resources/pop3/pop3resource.cpp b/resources/pop3/pop3resource.cpp index 52d78fd73..17fc83f1d 100644 --- a/resources/pop3/pop3resource.cpp +++ b/resources/pop3/pop3resource.cpp @@ -25,9 +25,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -- GitLab