Page Menu
Home
GnuPG
Search
Configure Global Search
Log In
Files
F26446348
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Size
11 KB
Subscribers
None
View Options
diff --git a/autotests/widgets/CMakeLists.txt b/autotests/widgets/CMakeLists.txt
index cb8c4e2..0011785 100644
--- a/autotests/widgets/CMakeLists.txt
+++ b/autotests/widgets/CMakeLists.txt
@@ -1,20 +1,21 @@
# SPDX-FileCopyrightText: 2023 g10 Code GmbH
# SPDX-FileContributor: Carl Schwan <carlschwan@kde.org>
# SPDX-License-Identifier: BSD-3-Clause
add_definitions(-DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../testdata")
include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake)
ecm_add_test(messageviewerdialogtest.cpp
LINK_LIBRARIES KPim6MimeTreeParserWidgets Qt::Test
NAME_PREFIX "widgets-"
)
add_executable(messageviewertest messageviewertest.cpp ../setupenv.cpp)
add_gpg_crypto_test(messageviewertest widgets-messageviewertest)
target_link_libraries(messageviewertest PUBLIC
Qt::Test
KPim6::MimeTreeParserWidgets
+ KPim6::MimeTreeParserCore
KF6::WidgetsAddons
Gpgmepp
)
diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt
index 4be0244..11d1845 100644
--- a/examples/widgets/CMakeLists.txt
+++ b/examples/widgets/CMakeLists.txt
@@ -1,14 +1,15 @@
# SPDX-FileCopyrightText: 2023 Carl Schwan <carl.schwan@gnupg.com>
# SPDX-License-Identifier: BSD-3-Clause
add_executable(mimetreeparser-widgets
main.cpp
)
find_package(KPim6Mbox ${KPIM_MIME_VERSION} CONFIG REQUIRED)
target_link_libraries(mimetreeparser-widgets PUBLIC
Qt::Widgets
KPim6::MimeTreeParserWidgets
KPim6::Mbox
+ KF6::I18n
)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8581591..2efe38e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,177 +1,176 @@
# SPDX-FileCopyrightText: 2023 Carl Schwan <carl.schwan@gnupg.com>
# SPDX-License-Identifier: BSD-3-Clause
ecm_setup_version(PROJECT
VARIABLE_PREFIX MIMETREEPARSER_CORE
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_core_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfigVersion.cmake"
SOVERSION 6
)
# public dynamic library
add_library(KPim6MimeTreeParserCore)
add_library(KPim6::MimeTreeParserCore
ALIAS KPim6MimeTreeParserCore
)
ecm_qt_declare_logging_category(KPim6MimeTreeParserCore
HEADER mimetreeparser_core_debug.h
IDENTIFIER MIMETREEPARSER_CORE_LOG
CATEGORY_NAME org.kde.pim.mimetreeparser.core
DESCRIPTION "mimetreeparser (pim lib)"
EXPORT MIMETREEPARSERNG
)
target_sources(KPim6MimeTreeParserCore PRIVATE
errors.h
attachmentmodel.h
bodypartformatter.h
bodypartformatterbasefactory.h
bodypartformatterbasefactory_p.h
cryptohelper.h
enums.h
fileopener.h
htmlutils.h
messageparser.h
messagepart.h
objecttreeparser.h
partmetadata.h
partmodel.h
utils.h
attachmentmodel.cpp
bodypartformatter.cpp
bodypartformatter_impl.cpp
bodypartformatterbasefactory.cpp
cryptohelper.cpp
fileopener.cpp
htmlutils.cpp
messageparser.cpp
messagepart.cpp
objecttreeparser.cpp
partmodel.cpp
utils.cpp
)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(KPim6MimeTreeParserCore PROPERTIES UNITY_BUILD ON)
endif()
generate_export_header(KPim6MimeTreeParserCore BASE_NAME mimetreeparser_core)
target_include_directories(KPim6MimeTreeParserCore
INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore>")
target_link_libraries(KPim6MimeTreeParserCore
PUBLIC
KPim6::Mime
- KPim6::Mbox
- KF6::I18n
+ KPim6::Libkleo
+ Gpgmepp
Qt::Gui
PRIVATE
- Gpgmepp
- KPim6::Libkleo
-
+ KPim6::Mbox
+ KF6::I18n
)
set_target_properties(KPim6MimeTreeParserCore PROPERTIES
VERSION ${MIMETREEPARSERNG_VERSION}
SOVERSION ${MIMETREEPARSERNG_SOVERSION}
EXPORT_NAME MimeTreeParserCore
)
ecm_generate_pri_file(BASE_NAME MimeTreeParserCore
LIB_NAME KPim6MimeTreeParserCore
DEPS "MimeTreeParserCore"
FILENAME_VAR PRI_FILENAME
)
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
install(TARGETS
KPim6MimeTreeParserCore
EXPORT KPim6MimeTreeParserCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
ecm_generate_headers(MimeTreeParserCore_CamelCase_HEADERS
HEADER_NAMES
AttachmentModel
CryptoHelper
Errors
FileOpener
MessageParser
MessagePart
ObjectTreeParser
PartModel
PartMetaData
Enums
REQUIRED_HEADERS MimeTreeParserCore_HEADERS
PREFIX MimeTreeParserCore
)
install(FILES
${MimeTreeParserCore_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore/MimeTreeParserCore
COMPONENT Devel
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_core_export.h
${MimeTreeParserCore_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore/mimetreeparsercore
COMPONENT Devel
)
if (BUILD_QCH)
ecm_add_qch(
KPim6MimeTreeParserCore_QCH
NAME MimeTreeParserCore
BASE_NAME KPim6MimeTreeParserCore
VERSION ${PIM_VERSION}
ORG_DOMAIN org.kde
# using only public headers, to cover only public API
SOURCES ${MimeTreeParserCore_HEADERS}
MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
LINK_QCHS
Qt6Core_QCH
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
BLANK_MACROS
MIMETREEPARSERCORE_EXPORT
TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
COMPONENT Devel
)
endif()
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6MimeTreeParserCore")
if (BUILD_QCH)
ecm_install_qch_export(
TARGETS KPim6MimeTreeParserCore_QCH
FILE KPim6MimeTreeParserCoreQchTargets.cmake
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6MimeTreeParserCoreQchTargets.cmake\")")
endif()
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimMimeTreeParserCoreConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(EXPORT KPim6MimeTreeParserCoreTargets
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
FILE KPim6MimeTreeParserCoreTargets.cmake
NAMESPACE KPim6::
)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 8abf9e6..c075c75 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,156 +1,157 @@
# SPDX-FileCopyrightText: 2023 g10 Code GmbH
# SPDX-FileContributor: Carl Schwan <carlschwan@kde.org>
# SPDX-License-Identifier: BSD-3-Clause
ecm_setup_version(PROJECT
VARIABLE_PREFIX MIMETREEPARSER_WIDGETS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfigVersion.cmake"
SOVERSION 6
)
add_library(KPim6MimeTreeParserWidgets)
add_library(KPim6::MimeTreeParserWidgets
ALIAS KPim6MimeTreeParserWidgets)
target_sources(KPim6MimeTreeParserWidgets PRIVATE
attachmentview_p.h
attachmentview.cpp
messagecontainerwidget_p.h
messagecontainerwidget.cpp
messageviewer.h
messageviewer.cpp
messageviewerdialog.h
messageviewerdialog.cpp
urlhandler_p.h
urlhandler.cpp
)
ecm_qt_declare_logging_category(KPim6MimeTreeParserWidgets
HEADER mimetreeparser_widgets_debug.h
IDENTIFIER MIMETREEPARSER_WIDGET_LOG
CATEGORY_NAME org.kde.pim.mimetreeparser.widgets
DESCRIPTION "mimetreeparser (pim lib)"
EXPORT MIMETREEPARSER
)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(KPim6MimeTreeParserWidgets PROPERTIES UNITY_BUILD ON)
endif()
generate_export_header(KPim6MimeTreeParserWidgets BASE_NAME mimetreeparser_widgets)
target_include_directories(KPim6MimeTreeParserWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets>")
target_link_libraries(KPim6MimeTreeParserWidgets
PUBLIC
Qt::Widgets
- KPim6::MimeTreeParserCore
+ KPim6::Mime
PRIVATE
+ KPim6::MimeTreeParserCore
Qt::PrintSupport
KF6::I18n
KF6::CalendarCore
KF6::WidgetsAddons
KPim6::Libkleo
Gpgmepp
)
set_target_properties(KPim6MimeTreeParserWidgets PROPERTIES
VERSION ${MIMETREEPARSER_WIDGETS_VERSION}
SOVERSION ${MIMETREEPARSER_WIDGETS_SOVERSION}
EXPORT_NAME MimeTreeParserWidgets
)
ecm_generate_pri_file(BASE_NAME MimeTreeParserWidgets
LIB_NAME KPim6MimeTreeParserWidgets
DEPS "MimeTreeParserWidgets"
FILENAME_VAR PRI_FILENAME
)
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
install(TARGETS
KPim6MimeTreeParserWidgets
EXPORT KPim6MimeTreeParserWidgetsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
ecm_generate_headers(MimeTreeParserWidgets_CamelCase_HEADERS
HEADER_NAMES
MessageViewer
MessageViewerDialog
REQUIRED_HEADERS MimeTreeParserWidgets_HEADERS
PREFIX MimeTreeParserWidgets
)
install(FILES
${MimeTreeParserWidgets_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets/MimeTreeParserWidgets
COMPONENT Devel
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_export.h
${MimeTreeParserWidgets_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets/mimetreeparserwidgets
COMPONENT Devel
)
if (BUILD_QCH)
ecm_add_qch(
KPim6MimeTreeParserWidgets_QCH
NAME MimeTreeParserWidgets
BASE_NAME KPim6MimeTreeParserWidgets
VERSION ${PIM_VERSION}
ORG_DOMAIN org.kde
# using only public headers, to cover only public API
SOURCES ${MimeTreeParserWidgets_HEADERS}
MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
LINK_QCHS
Qt6Core_QCH
Qt6Widgets_QCH
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
BLANK_MACROS
MIMETREEPARSER_WIDGETS_EXPORT
TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
COMPONENT Devel
)
endif()
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6MimeTreeParserWidgets")
if (BUILD_QCH)
ecm_install_qch_export(
TARGETS KPim6MimeTreeParserWidgets_QCH
FILE KPim6MimeTreeParserWidgetsQchTargets.cmake
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6MimeTreeParserWidgetsQchTargets.cmake\")")
endif()
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimMimeTreeParserWidgetsConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(EXPORT KPim6MimeTreeParserWidgetsTargets
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
FILE KPim6MimeTreeParserWidgetsTargets.cmake
NAMESPACE KPim6::
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets
COMPONENT Devel
)
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Jul 17, 12:52 AM (1 d, 6 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
1e/42/ae837179756c08442206ad0a077e
Attached To
rMTP MIME Tree Parser
Event Timeline
Log In to Comment