Commit cea29406 authored by Christophe Giboudeaux's avatar Christophe Giboudeaux
Browse files

Fix a potential build issue when building KMail

Summary:
some public mailcommon headers include libkdepim ones but the build system
currently doesn't look for this dependency.

Let's look for libkdepim for building mailcommon and explicitly add
KF5::Libkdepim to the 'PUBLIC' link targets to fix the
INTERFACE_LINK_LIBRARIES instead of relying on indirect dependencies.

Also fix a wrong #include statement.

BUG: 407163
FIXED-IN: 5.11.2

Reviewers: mlaurent, vandenoever

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D21205
parent 1ad4c014
......@@ -58,6 +58,7 @@ find_package(KF5SyntaxHighlighting ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailImporter ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
......
......@@ -2,6 +2,7 @@
include(CMakeFindDependencyMacro)
find_dependency(KF5Akonadi "@AKONADI_VERSION@")
find_dependency(KF5AkonadiMime "@AKONADIMIME_LIB_VERSION@")
find_dependency(KF5Libkdepim "@LIBKDEPIM_LIB_VERSION@")
find_dependency(KF5MessageComposer "@MESSAGELIB_LIB_VERSION@")
find_dependency(KF5PimCommon "@MESSAGELIB_LIB_VERSION@")
find_dependency(KF5Completion "@KF5_MIN_VERSION@")
......
......@@ -225,6 +225,7 @@ target_link_libraries(KF5MailCommon
PUBLIC
KF5::AkonadiCore
KF5::AkonadiMime
KF5::Libkdepim
KF5::MessageComposer
KF5::PimCommonAkonadi
KF5::Completion
......
......@@ -22,7 +22,8 @@
#define MAILCOMMON_BACKUPJOB_H
#include "mailcommon_export.h"
#include "libkdepim/progressmanager.h"
#include <Libkdepim/ProgressManager>
#include <Collection>
#include <Item>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment