Commit 6e548cb1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Prepare 5.14.0 beta1. Update ecm as 5.67.0 is broken see 417396....

GIT_SILENT: Prepare 5.14.0 beta1. Update ecm as 5.67.0 is broken see 417396. 5.68 will be release in 2 days. But dependancy freeze is tomorrow.
parent 5b2628ac
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.13.40")
set(PIM_VERSION "5.13.80")
project(MailTransport VERSION ${PIM_VERSION})
# ECM setup
set(KF5_MIN_VERSION "5.67.0")
set(KF5_MIN_VERSION "5.68.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......@@ -60,14 +60,10 @@ endif(BUILD_TESTING)
########### Targets ###########
add_subdirectory(src)
if (ECM_VERSION VERSION_LESS "5.68.0")
install(FILES kmailtransport.renamecategories kmailtransport.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
else ()
ecm_qt_install_logging_categories(
ecm_qt_install_logging_categories(
EXPORT MAILTRANSPORT
FILE kmailtransport.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
org.kde.pim.mailtransport kmailtransport (kmailtransport) IDENTIFIER [MAILTRANSPORT_LOG]
org.kde.pim.mailtransportakonadi kmailtransportakonadi (kmailtransportakonadi) IDENTIFIER [MAILTRANSPORTAKONADI_LOG]
org.kde.pim.mailtransport.smtpplugin kmailtransport (smtp plugin) IDENTIFIER [MAILTRANSPORT_SMTP_LOG]
org.kde.pim.mailtransport.akonadiplugin kmailtransport (akonadi plugin) IDENTIFIER [MAILTRANSPORT_AKONADI_LOG]
log_smtp org.kde.pim.smtp
log_mailtransport org.kde.pim.mailtransport
......@@ -28,15 +28,11 @@ set(mailtransport_plugins_srcs
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport)
else()
ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport
ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport
DESCRIPTION "kmailtransport (kmailtransport)"
OLD_CATEGORY_NAMES log_mailtransport
EXPORT MAILTRANSPORT
)
endif()
ki18n_wrap_ui(mailtransport_lib_srcs
ui/addtransportdialog.ui
......
......@@ -11,15 +11,11 @@ set(mailtransport_smtpplugin_SRCS
ki18n_wrap_ui(mailtransport_smtpplugin_SRCS
smtpsettings.ui
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(mailtransport_smtpplugin_SRCS HEADER mailtransportplugin_smtp_debug.h IDENTIFIER MAILTRANSPORT_SMTP_LOG CATEGORY_NAME org.kde.pim.mailtransport.smtpplugin)
else()
ecm_qt_declare_logging_category(mailtransport_smtpplugin_SRCS HEADER mailtransportplugin_smtp_debug.h IDENTIFIER MAILTRANSPORT_SMTP_LOG CATEGORY_NAME org.kde.pim.mailtransport.smtpplugin
ecm_qt_declare_logging_category(mailtransport_smtpplugin_SRCS HEADER mailtransportplugin_smtp_debug.h IDENTIFIER MAILTRANSPORT_SMTP_LOG CATEGORY_NAME org.kde.pim.mailtransport.smtpplugin
DESCRIPTION "kmailtransport (smtp plugin)"
OLD_CATEGORY_NAMES log_smtp
EXPORT MAILTRANSPORT
)
endif()
kcoreaddons_add_plugin(mailtransport_smtpplugin JSON smtpmailtransport.json SOURCES
......
......@@ -20,14 +20,10 @@ set(mailtransportakonadi_lib_srcs
filteractionjob.cpp
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(mailtransportakonadi_lib_srcs HEADER mailtransportakonadi_debug.h IDENTIFIER MAILTRANSPORTAKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransportakonadi)
else()
ecm_qt_declare_logging_category(mailtransportakonadi_lib_srcs HEADER mailtransportakonadi_debug.h IDENTIFIER MAILTRANSPORTAKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransportakonadi
ecm_qt_declare_logging_category(mailtransportakonadi_lib_srcs HEADER mailtransportakonadi_debug.h IDENTIFIER MAILTRANSPORTAKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransportakonadi
DESCRIPTION "kmailtransportakonadi (kmailtransportakonadi)"
EXPORT MAILTRANSPORT
)
endif()
add_library(KF5MailTransportAkonadi ${mailtransportakonadi_lib_srcs}
......
......@@ -3,16 +3,11 @@ set(mailtransport_akonadiplugin_SRCS
resourcesendjob.cpp
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(mailtransport_akonadiplugin_SRCS HEADER mailtransportplugin_akonadi_debug.h IDENTIFIER
MAILTRANSPORT_AKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransport.akonadiplugin)
else()
ecm_qt_declare_logging_category(mailtransport_akonadiplugin_SRCS HEADER mailtransportplugin_akonadi_debug.h IDENTIFIER
ecm_qt_declare_logging_category(mailtransport_akonadiplugin_SRCS HEADER mailtransportplugin_akonadi_debug.h IDENTIFIER
MAILTRANSPORT_AKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransport.akonadiplugin
DESCRIPTION "kmailtransport (akonadi plugin)"
EXPORT MAILTRANSPORT
)
endif()
......
Markdown is supported
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