From cea29406f7a1c1cdca2cbbde19ac9e8008b28342 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 14 May 2019 09:23:45 +0200
Subject: [PATCH] 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
---
 CMakeLists.txt               | 1 +
 KF5MailCommonConfig.cmake.in | 1 +
 src/CMakeLists.txt           | 1 +
 src/job/backupjob.h          | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70246f0..671df07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/KF5MailCommonConfig.cmake.in b/KF5MailCommonConfig.cmake.in
index 00c998c..3ff3d78 100644
--- a/KF5MailCommonConfig.cmake.in
+++ b/KF5MailCommonConfig.cmake.in
@@ -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@")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07bbed5..c528c09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -225,6 +225,7 @@ target_link_libraries(KF5MailCommon
 PUBLIC
   KF5::AkonadiCore
   KF5::AkonadiMime
+  KF5::Libkdepim
   KF5::MessageComposer
   KF5::PimCommonAkonadi
   KF5::Completion
diff --git a/src/job/backupjob.h b/src/job/backupjob.h
index ed4d0bd..c803dcc 100644
--- a/src/job/backupjob.h
+++ b/src/job/backupjob.h
@@ -22,7 +22,8 @@
 #define MAILCOMMON_BACKUPJOB_H
 
 #include "mailcommon_export.h"
-#include "libkdepim/progressmanager.h"
+
+#include <Libkdepim/ProgressManager>
 
 #include <Collection>
 #include <Item>