Commit 6d5815d0 authored by Laurent Montel's avatar Laurent Montel 😁

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 b049d683
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.13.40")
set(PIM_VERSION "5.13.80")
project(libksieve VERSION ${PIM_VERSION})
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})
......@@ -105,15 +105,11 @@ endif()
add_subdirectory(src)
add_subdirectory(kioslave)
if (ECM_VERSION VERSION_LESS "5.68.0")
install(FILES libksieve.categories libksieve.renamecategories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
else ()
ecm_qt_install_logging_categories(
ecm_qt_install_logging_categories(
EXPORT LIBKSIEVE
FILE libksieve.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
set(kio_sieve_PART_SRCS sieve.cpp )
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(kio_sieve_PART_SRCS HEADER sieve_debug.h IDENTIFIER SIEVE_LOG CATEGORY_NAME org.kde.pim.sieve)
else()
ecm_qt_declare_logging_category(kio_sieve_PART_SRCS HEADER sieve_debug.h IDENTIFIER SIEVE_LOG CATEGORY_NAME org.kde.pim.sieve
ecm_qt_declare_logging_category(kio_sieve_PART_SRCS HEADER sieve_debug.h IDENTIFIER SIEVE_LOG CATEGORY_NAME org.kde.pim.sieve
DESCRIPTION "kioslave (sieve)"
OLD_CATEGORY_NAMES log_sieve
EXPORT LIBKSIEVE
)
endif()
add_library(kio_sieve MODULE ${kio_sieve_PART_SRCS})
......
org.kde.pim.libksieve kdepim (libksieve) IDENTIFIER [LIBKSIEVE_LOG]
org.kde.pim.kmanagersieve kdepim (libksieve manager) IDENTIFIER [KMANAGERSIEVE_LOG]
org.kde.pim.sieve kioslave (sieve) IDENTIFIER [SIEVE_LOG]
log_libksieve org.kde.pim.libksieve
log_kmanagersieve org.kde.pim.kmanagersieve
log_sieve org.kde.pim.sieve
......@@ -4,15 +4,11 @@ set(kmanagesieve_LIB_SRCS
sessionthread.cpp
sievejob.cpp
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(kmanagesieve_LIB_SRCS HEADER kmanagersieve_debug.h IDENTIFIER KMANAGERSIEVE_LOG CATEGORY_NAME org.kde.pim.kmanagersieve)
else()
ecm_qt_declare_logging_category(kmanagesieve_LIB_SRCS HEADER kmanagersieve_debug.h IDENTIFIER KMANAGERSIEVE_LOG CATEGORY_NAME org.kde.pim.kmanagersieve
ecm_qt_declare_logging_category(kmanagesieve_LIB_SRCS HEADER kmanagersieve_debug.h IDENTIFIER KMANAGERSIEVE_LOG CATEGORY_NAME org.kde.pim.kmanagersieve
DESCRIPTION "kdepim (libksieve manager)"
OLD_CATEGORY_NAMES log_kmanagersieve
EXPORT LIBKSIEVE
)
endif()
add_library(KF5KManageSieve ${kmanagesieve_LIB_SRCS})
......
......@@ -223,15 +223,11 @@ set(ksieveui_LIB_SRCS
${ksieveui_managescriptjob_LIB_SRCS}
)
if (ECM_VERSION VERSION_LESS "5.68.0")
ecm_qt_declare_logging_category(ksieveui_LIB_SRCS HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME org.kde.pim.libksieve)
else()
ecm_qt_declare_logging_category(ksieveui_LIB_SRCS HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME org.kde.pim.libksieve
ecm_qt_declare_logging_category(ksieveui_LIB_SRCS HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME org.kde.pim.libksieve
DESCRIPTION "kdepim (libksieve)"
OLD_CATEGORY_NAMES log_libksieve
EXPORT LIBKSIEVE
)
endif()
kconfig_add_kcfg_files(ksieveui_LIB_SRCS settings/sieve-vacation.kcfgc settings/sieve-editor.kcfgc)
......
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