Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi Mime
Commits
8668265e
Commit
8668265e
authored
Feb 21, 2022
by
Laurent Montel
😁
Browse files
normalize install header include (fix qt6 build)
parent
27cbc3c4
Pipeline
#140457
failed with stages
in 36 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8668265e
...
...
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required
(
VERSION 3.16 FATAL_ERROR
)
set
(
PIM_VERSION
"5.19.4
0
"
)
set
(
PIM_VERSION
"5.19.4
1
"
)
project
(
Akonadi-Mime VERSION
${
PIM_VERSION
}
)
# ECM setup
...
...
@@ -111,7 +111,7 @@ install(EXPORT KF5AkonadiMimeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/akonadi-mime_version.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
COMPONENT Devel
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/AkonadiMime
COMPONENT Devel
)
ecm_qt_install_logging_categories
(
...
...
serializers/akonadi_serializer_mail.cpp
View file @
8668265e
...
...
@@ -6,6 +6,7 @@
#include "akonadi_serializer_mail.h"
#include "akonadi_serializer_mail_debug.h"
#include "messageparts.h"
#include <QDataStream>
#include <QIODevice>
...
...
@@ -14,7 +15,6 @@
#include <KMime/Message>
#include <Akonadi/Item>
#include <Akonadi/KMime/MessageParts>
#include <akonadi/private/imapparser_p.h>
using
namespace
Akonadi
;
...
...
src/CMakeLists.txt
View file @
8668265e
...
...
@@ -97,10 +97,8 @@ generate_export_header(KF5AkonadiMime BASE_NAME akonadi-mime)
add_library
(
KF5::AkonadiMime ALIAS KF5AkonadiMime
)
# NOTE: The include directories remain 'akonadi/kmime' to be as SC as possible.
target_include_directories
(
KF5AkonadiMime INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
}
/Akonadi/KMime>"
)
target_include_directories
(
KF5AkonadiMime INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
}
/AkonadiMime>"
)
target_include_directories
(
KF5AkonadiMime PUBLIC
"$<BUILD_INTERFACE:
${
Akonadi-Mime_SOURCE_DIR
}
/src;
${
Akonadi-Mime_BINARY_DIR
}
/src>"
)
target_include_directories
(
KF5AkonadiMime INTERFACE
"$<INSTALL_INTERFACE:
${
KDE_INSTALL_INCLUDEDIR_KF
}
/akonadi/kmime>"
)
target_link_libraries
(
KF5AkonadiMime
PUBLIC
...
...
@@ -145,25 +143,25 @@ ecm_generate_headers(AkonadiMime_CamelCase_HEADERS
SpecialMailCollectionsRequestJob
StandardMailActionManager
REQUIRED_HEADERS AkonadiMime_HEADERS
PREFIX Akonadi
/KMime
PREFIX Akonadi
)
install
(
FILES
${
AkonadiMime_CamelCase_HEADERS
}
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/Akonadi
/K
Mime
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/AkonadiMime
/Akonadi
COMPONENT Devel
)
install
(
FILES
${
AkonadiMime_HEADERS
}
${
CMAKE_CURRENT_BINARY_DIR
}
/akonadi-mime_export.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/
a
konadi
/kmime
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/
A
konadi
Mime/akonadi
COMPONENT Devel
)
ecm_generate_pri_file
(
BASE_NAME AkonadiMime
LIB_NAME KF5AkonadiMime
DEPS
"AkonadiCore"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
}
/Akonadi
/K
Mime
DEPS
"AkonadiCore"
FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${
KDE_INSTALL_INCLUDEDIR_KF
}
/AkonadiMime
)
install
(
FILES
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment