Page MenuHome GnuPG
Files F20320628

No OneTemporary
Actions

View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bae6bc4..09fe9030 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <montel@kde.org>
# SPDX-License-Identifier: CC0-1.0
include:
- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
diff --git a/.kde-ci.yml b/.kde-ci.yml
index 7eff4c5a..6262a3e4 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -1,30 +1,18 @@
# SPDX-FileCopyrightText: None
# SPDX-License-Identifier: CC0-1.0
Dependencies:
-- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
- 'require':
- 'frameworks/extra-cmake-modules': '@latest'
- 'pim/kpimtextedit' : '@same'
- 'frameworks/ki18n': '@latest'
- 'frameworks/kconfig': '@latest'
- 'frameworks/kwidgetsaddons': '@latest'
- 'frameworks/kcompletion': '@latest'
- 'frameworks/kcoreaddons': '@latest'
- 'frameworks/kcodecs': '@latest'
- 'frameworks/kitemmodels': '@latest'
-
- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
'require':
'frameworks/extra-cmake-modules': '@latest-kf6'
'pim/kpimtextedit' : '@latest-kf6'
'frameworks/ki18n': '@latest-kf6'
'frameworks/kconfig': '@latest-kf6'
'frameworks/kwidgetsaddons': '@latest-kf6'
'frameworks/kcompletion': '@latest-kf6'
'frameworks/kcoreaddons': '@latest-kf6'
'frameworks/kcodecs': '@latest-kf6'
'frameworks/kitemmodels': '@latest-kf6'
Options:
require-passing-tests-on: [ 'Linux', 'FreeBSD' ]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c33d54a..39ff8ec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,198 +1,198 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(PIM_VERSION "5.23.41")
project(libkleo VERSION ${PIM_VERSION})
-set(KF_MIN_VERSION "5.105.0")
+set(KF_MIN_VERSION "5.240.0")
if (WIN32)
- set(KF5_WANT_VERSION "5.70.0")
+ set(KF6_WANT_VERSION "5.70.0")
else ()
- set(KF5_WANT_VERSION ${KF_MIN_VERSION})
+ set(KF6_WANT_VERSION ${KF_MIN_VERSION})
endif ()
-find_package(ECM ${KF5_WANT_VERSION} CONFIG REQUIRED)
+find_package(ECM ${KF6_WANT_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMGenerateExportHeader)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMGeneratePriFile)
include(FeatureSummary)
include(ECMQtDeclareLoggingCategory)
include(ECMDeprecationSettings)
include(ECMAddQch)
include(KDEClangFormat)
include(KDEGitCommitHooks)
option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON)
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
-set(QT_REQUIRED_VERSION "5.15.2")
+set(QT_REQUIRED_VERSION "6.4.0")
if (QT_MAJOR_VERSION STREQUAL "6")
set(QT_REQUIRED_VERSION "6.4.0")
set(KF_MIN_VERSION "5.240.0")
set(KF_MAJOR_VERSION "6")
else()
set(KF_MAJOR_VERSION "5")
endif()
set(KDEPIMTEXTEDIT_VERSION "5.23.40")
set(GPGME_REQUIRED_VERSION "1.16.0")
-find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
if (QT_MAJOR_VERSION STREQUAL "6")
find_package(Qt6Core5Compat)
endif()
-find_package(KF${KF_MAJOR_VERSION}I18n ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}Config ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}ConfigWidgets ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}Completion ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}CoreAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}Codecs ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KF${KF_MAJOR_VERSION}ItemModels ${KF5_WANT_VERSION} CONFIG REQUIRED)
-find_package(KPim${KF_MAJOR_VERSION}TextEdit ${KDEPIMTEXTEDIT_VERSION} CONFIG)
+find_package(KF6I18n ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6Config ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6WidgetsAddons ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6ConfigWidgets ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6Completion ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6CoreAddons ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6Codecs ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KF6ItemModels ${KF6_WANT_VERSION} CONFIG REQUIRED)
+find_package(KPim6TextEdit ${KDEPIMTEXTEDIT_VERSION} CONFIG)
find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME++ Library" URL "https://www.gnupg.org" TYPE REQUIRED PURPOSE "GpgME++ is required for OpenPGP support")
if (QT_MAJOR_VERSION STREQUAL "6")
find_package(QGpgmeQt6 ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
else()
find_package(QGpgme ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
endif()
message(STATUS "GpgME++ Version ${Gpgmepp_VERSION}")
if (QGpgme_VERSION VERSION_GREATER_EQUAL "1.18.1")
set(QGPGME_LISTALLKEYSJOB_HAS_OPTIONS 1)
endif()
find_package(Boost 1.34.0)
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "https://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
-set_package_properties(KPim${KF_MAJOR_VERSION}TextEdit PROPERTIES DESCRIPTION
+set_package_properties(KPim6TextEdit PROPERTIES DESCRIPTION
"A textedit with PIM-specific features."
URL "https://commits.kde.org/kpimtextedit"
TYPE OPTIONAL PURPOSE "Improved audit log viewer.")
ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKLEO
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h"
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoConfigVersion.cmake"
- SOVERSION 5
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
+ SOVERSION 6
)
########### Targets ###########
ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.105.0)
remove_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_NO_EMIT)
########### CMake Config Files ###########
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Libkleo")
-set(LIBKLEO_KF5_COMPAT FALSE)
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6Libkleo")
+set(LIBKLEO_KF6_COMPAT FALSE)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkleoConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoConfigVersion.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
-install(EXPORT KPim${KF_MAJOR_VERSION}LibkleoTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}LibkleoTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::)
+install(EXPORT KPim6LibkleoTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim6LibkleoTargets.cmake NAMESPACE KPim6::)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo COMPONENT Devel
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo COMPONENT Devel
)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-libkleo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkleo.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
if (USE_UNITY_CMAKE_SUPPORT)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
endif()
add_subdirectory(src)
if (BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
endif()
ecm_qt_install_logging_categories(
EXPORT LIBKLEO
FILE libkleo.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
ki18n_install(po)
if (BUILD_QCH)
ecm_install_qch_export(
- TARGETS KPim${KF_MAJOR_VERSION}Libkleo_QCH
- FILE KPim${KF_MAJOR_VERSION}LibkleoQchTargets.cmake
+ TARGETS KPim6Libkleo_QCH
+ FILE KPim6LibkleoQchTargets.cmake
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
- set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}LibkleoQchTargets.cmake\")")
+ set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LibkleoQchTargets.cmake\")")
endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
# add clang-format target for all our real source files
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
if (BUILD_WITH_COMPAT_LIBS)
#if (QT_MAJOR_VERSION STREQUAL "5")
##
# TODO: Backwards compatiblity. Remove in next major version
##
-set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Libkleo")
-set(LIBKLEO_KF5_COMPAT TRUE)
+set(CMAKECONFIG_INSTALL_DIR_KF6 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6Libkleo")
+set(LIBKLEO_KF6_COMPAT TRUE)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkleoConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkleoConfig.cmake"
- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5}
+ "${CMAKE_CURRENT_BINARY_DIR}/KF6LibkleoConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF6}
)
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkleoConfig.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF6LibkleoConfig.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF6}"
COMPONENT Devel
)
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoConfigVersion.cmake"
- RENAME "KF5LibkleoConfigVersion.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
+ RENAME "KF6LibkleoConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF6}"
COMPONENT Devel
)
-install(EXPORT KPim${KF_MAJOR_VERSION}LibkleoTargets
- DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
- FILE KPim${KF_MAJOR_VERSION}LibkleoTargets.cmake
- NAMESPACE KF5::
+install(EXPORT KPim6LibkleoTargets
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF6}"
+ FILE KPim6LibkleoTargets.cmake
+ NAMESPACE KF6::
)
if (BUILD_QCH)
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkleoQchTargets.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoQchTargets.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF6}"
COMPONENT Devel
)
endif()
#endif()
endif()
diff --git a/CMakePresets.json b/CMakePresets.json
index 1abcc3ba..81cb5365 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,215 +1,218 @@
{
"version": 3,
"configurePresets": [
{
"name": "base",
"displayName": "base preset",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build-${presetName}",
"installDir": "$env{KF6}",
+ "cacheVariables": {
+ "BUILD_WITH_QT6": "ON"
+ },
"hidden": true
},
{
"name": "dev-mold",
"displayName": "Build as debug + using mold linker",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold"
},
"inherits": [
"base"
]
},
{
"name": "dev",
"displayName": "Build as debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"inherits": [
"base"
]
},
{
"name": "dev-qch",
"displayName": "Build as debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"BUILD_QCH": "ON"
},
"inherits": [
"base"
]
},
{
"name": "asan",
"displayName": "Build with Asan support.",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"ECM_ENABLE_SANITIZERS" : "'address;undefined'"
},
"inherits": [
"base"
]
},
{
"name": "dev-clang",
"displayName": "dev-clang",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"environment": {
"CXX": "clang++",
"CCACHE_DISABLE": "ON"
},
"inherits": [
"base"
]
},
{
"name": "unity",
"displayName": "Build with CMake unity support.",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"USE_UNITY_CMAKE_SUPPORT": "ON"
},
"inherits": [
"base"
]
},
{
"name": "release",
"displayName": "Build as release mode.",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
},
"inherits": [
"base"
]
},
{
"name": "profile",
"displayName": "profile",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
},
"inherits": [
"base"
]
},
{
"name": "coverage",
"displayName": "coverage",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"USE_UNITY_CMAKE_SUPPORT": "OFF",
"BUILD_COVERAGE": "ON"
},
"inherits": [
"base"
]
},
{
"name": "clazy",
"displayName": "clazy",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
"environment": {
"CXX": "clazy",
"CCACHE_DISABLE": "ON"
},
"inherits": [
"base"
]
},
{
"name": "pch",
"displayName": "pch",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"USE_PRECOMPILED_HEADERS": "ON",
"BUILD_COVERAGE": "ON"
},
"inherits": [
"base"
]
}
],
"buildPresets": [
{
"name": "dev",
"configurePreset": "dev"
},
{
"name": "dev-mold",
"configurePreset": "dev-mold"
},
{
"name": "dev-qch",
"configurePreset": "dev-qch"
},
{
"name": "dev-clang",
"configurePreset": "dev-clang"
},
{
"name": "pch",
"configurePreset": "pch"
},
{
"name": "release",
"configurePreset": "release"
},
{
"name": "unity",
"configurePreset": "unity"
},
{
"name": "coverage",
"configurePreset": "coverage"
},
{
"name": "asan",
"configurePreset": "asan"
},
{
"name": "clazy",
"configurePreset": "clazy",
"environment": {
"CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
"CCACHE_DISABLE" : "ON"
}
}
],
"testPresets": [
{
"name": "dev",
"configurePreset": "dev",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": false}
},
{
"name": "asan",
"configurePreset": "asan",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": true}
},
{
"name": "unity",
"configurePreset": "unity",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": true}
},
{
"name": "coverage",
"configurePreset": "coverage",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": true}
}
]
}
diff --git a/KPimLibkleoConfig.cmake.in b/KPimLibkleoConfig.cmake.in
index da2a0d73..eb33781d 100644
--- a/KPimLibkleoConfig.cmake.in
+++ b/KPimLibkleoConfig.cmake.in
@@ -1,22 +1,22 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(Gpgmepp "@GPGME_REQUIRED_VERSION@")
if ("@QT_MAJOR_VERSION@" STREQUAL "5")
find_dependency(QGpgme "@GPGME_REQUIRED_VERSION@")
else()
find_dependency(QGpgmeQt6 "@GPGME_REQUIRED_VERSION@")
endif()
if (@LIBKLEO_KF5_COMPAT@)
message(WARNING "\n"
"************* DEPRECATION WARNING *************\n"
"Using find_package(KF5LibKleo) and KF5::LibKleo targets is deprecated. "
- "Please use find_package(KPim@KF_MAJOR_VERSION@LibKleo) and KPim@KF_MAJOR_VERSION@::LibKleo instead. This backwards "
+ "Please use find_package(KPim6LibKleo) and KPim6::LibKleo instead. This backwards "
"compatibility will be removed in the next major version.\n"
"***********************************************\n")
endif()
-include("${CMAKE_CURRENT_LIST_DIR}/KPim@KF_MAJOR_VERSION@LibkleoTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KPim6LibkleoTargets.cmake")
@PACKAGE_INCLUDE_QCHTARGETS@
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 84d0b11a..b49638c2 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,51 +1,51 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
include(ECMAddTests)
-find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+find_package(Qt6Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
if(NOT TARGET Qt::Test)
- message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be built.")
+ message(STATUS "Qt6Test not found, autotests will not be built.")
return()
endif()
ecm_add_test(
flatkeylistmodeltest.cpp
abstractkeylistmodeltest.cpp
TEST_NAME flatkeylistmodeltest
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo Qt::Test
)
ecm_add_test(
hierarchicalkeylistmodeltest.cpp
abstractkeylistmodeltest.cpp
abstractkeylistmodeltest.h
TEST_NAME hierarchicalkeylistmodeltest
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo Qt::Test
)
ecm_add_test(
keyresolvercoretest.cpp
keyresolvercoretest.qrc
TEST_NAME keyresolvercoretest
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo Qt::Test
)
ecm_add_tests(
editdirectoryservicedialogtest.cpp
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo KF${KF_MAJOR_VERSION}::WidgetsAddons Qt::Widgets Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo KF6::WidgetsAddons Qt::Widgets Qt::Test
)
ecm_add_tests(
keyselectioncombotest.cpp
keyserverconfigtest.cpp
newkeyapprovaldialogtest.cpp
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo Qt::Widgets Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo Qt::Widgets Qt::Test
)
ecm_add_tests(
hextest.cpp
- LINK_LIBRARIES KPim${KF_MAJOR_VERSION}::Libkleo Qt::Test
+ LINK_LIBRARIES KPim6::Libkleo Qt::Test
)
diff --git a/metainfo.yaml b/metainfo.yaml
index cbb239f2..f2051b51 100644
--- a/metainfo.yaml
+++ b/metainfo.yaml
@@ -1,14 +1,14 @@
description: Kleopatra certificate management library
tier: 3
type: integration
platforms:
- name: All
portingAid: false
deprecated: false
release: false
libraries:
- qmake: Libkleo
- cmake: "KF5::Libkleo"
-cmakename: KF5Libkleo
+ cmake: "KPim6::Libkleo"
+cmakename: KPim6Libkleo
group: kdepim
public_lib: true
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d922d58..f2786828 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,389 +1,389 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
# target_include_directories does not handle empty include paths
include_directories(
${Boost_INCLUDE_DIRS}
${GPGME_INCLUDES}
)
add_definitions(-DTRANSLATION_DOMAIN=\"libkleopatra\")
#add_definitions( -DQT_NO_CAST_FROM_ASCII )
#add_definitions( -DQT_NO_CAST_TO_ASCII )
kde_enable_exceptions()
add_definitions( -DGPGMEPP_ERR_SOURCE_DEFAULT=13 ) # 13 is GPG_ERR_SOURCE_KLEO, even if gpg-error's too old to know about
add_subdirectory( pics )
-add_library(KPim${KF_MAJOR_VERSION}Libkleo)
-add_library(KPim${KF_MAJOR_VERSION}::Libkleo ALIAS KPim${KF_MAJOR_VERSION}Libkleo)
+add_library(KPim6Libkleo)
+add_library(KPim6::Libkleo ALIAS KPim6Libkleo)
########### next target ###############
-target_sources(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE
+target_sources(KPim6Libkleo PRIVATE
kleo/auditlogentry.cpp
kleo/auditlogentry.h
kleo/checksumdefinition.cpp
kleo/checksumdefinition.h
kleo/debug.cpp
kleo/debug.h
kleo/defaultkeyfilter.cpp
kleo/defaultkeyfilter.h
kleo/defaultkeygenerationjob.cpp
kleo/defaultkeygenerationjob.h
kleo/docaction.cpp kleo/docaction.h
kleo/dn.cpp
kleo/dn.h
kleo/enum.cpp
kleo/enum.h
kleo/kconfigbasedkeyfilter.cpp
kleo/kconfigbasedkeyfilter.h
kleo/keyfilter.h
kleo/keyfiltermanager.cpp
kleo/keyfiltermanager.h
kleo/keygroup.cpp
kleo/keygroup.h
kleo/keygroupconfig.cpp
kleo/keygroupconfig.h
kleo/keygroupimportexport.cpp
kleo/keygroupimportexport.h
kleo/keyresolver.cpp
kleo/keyresolver.h
kleo/keyresolvercore.cpp
kleo/keyresolvercore.h
kleo/keyserverconfig.cpp
kleo/keyserverconfig.h
kleo/kleoexception.cpp
kleo/kleoexception.h
kleo/oidmap.cpp
kleo/oidmap.h
kleo/predicates.h
kleo/stl_util.h
models/keycache.cpp
models/keycache.h
models/keycache_p.h
models/keylist.h
models/keylistmodel.cpp
models/keylistmodel.h
models/keylistmodelinterface.cpp
models/keylistmodelinterface.h
models/keylistsortfilterproxymodel.cpp
models/keylistsortfilterproxymodel.h
models/keyrearrangecolumnsproxymodel.cpp
models/keyrearrangecolumnsproxymodel.h
models/subkeylistmodel.cpp
models/subkeylistmodel.h
models/useridlistmodel.cpp
models/useridlistmodel.h
utils/algorithm.h
utils/assuan.cpp
utils/assuan.h
utils/classify.cpp
utils/classify.h
utils/compat.cpp
utils/compat.h
utils/compliance.cpp
utils/compliance.h
utils/cryptoconfig.cpp
utils/cryptoconfig.h
utils/cryptoconfig_p.h
utils/filesystemwatcher.cpp
utils/filesystemwatcher.h
utils/formatting.cpp
utils/formatting.h
utils/gnupg-registry.c
utils/gnupg-registry.h
utils/gnupg.cpp
utils/gnupg.h
utils/hex.cpp
utils/hex.h
utils/keyhelpers.cpp
utils/keyhelpers.h
utils/qtstlhelpers.cpp
utils/qtstlhelpers.h
utils/scdaemon.cpp
utils/scdaemon.h
utils/stringutils.cpp
utils/stringutils.h
utils/systeminfo.cpp
utils/systeminfo.h
utils/test.cpp
utils/test.h
utils/uniquelock.cpp
utils/uniquelock.h
)
-ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Libkleo HEADER libkleo_debug.h IDENTIFIER LIBKLEO_LOG CATEGORY_NAME org.kde.pim.libkleo
+ecm_qt_declare_logging_category(KPim6Libkleo HEADER libkleo_debug.h IDENTIFIER LIBKLEO_LOG CATEGORY_NAME org.kde.pim.libkleo
DESCRIPTION "libkleo (kleo_core)"
EXPORT LIBKLEO
)
-target_sources(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE
+target_sources(KPim6Libkleo PRIVATE
ui/auditlogviewer.cpp
ui/auditlogviewer.h
ui/cryptoconfigentryreaderport.cpp
ui/cryptoconfigentryreaderport_p.h
ui/cryptoconfigmodule.cpp
ui/cryptoconfigmodule.h
ui/cryptoconfigmodule_p.h
ui/directoryserviceswidget.cpp
ui/directoryserviceswidget.h
ui/dnattributeorderconfigwidget.cpp
ui/dnattributeorderconfigwidget.h
ui/editdirectoryservicedialog.cpp
ui/editdirectoryservicedialog.h
ui/filenamerequester.cpp
ui/filenamerequester.h
ui/messagebox.cpp
ui/messagebox.h
ui/navigatabletreeview.cpp
ui/navigatabletreeview.h
ui/navigatabletreewidget.cpp
ui/navigatabletreewidget.h
ui/progressbar.cpp
ui/progressbar.h
ui/progressdialog.cpp
ui/progressdialog.h
ui/readerportselection.cpp
ui/readerportselection.h
)
-ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Libkleo HEADER kleo_ui_debug.h IDENTIFIER KLEO_UI_LOG CATEGORY_NAME org.kde.pim.kleo_ui
+ecm_qt_declare_logging_category(KPim6Libkleo HEADER kleo_ui_debug.h IDENTIFIER KLEO_UI_LOG CATEGORY_NAME org.kde.pim.kleo_ui
DESCRIPTION "libkleo (kleo_ui)"
OLD_CATEGORY_NAMES log_kleo_ui
EXPORT LIBKLEO
)
-target_sources(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE # make this a separate lib.
+target_sources(KPim6Libkleo PRIVATE # make this a separate lib.
ui/keyapprovaldialog.cpp
ui/keyapprovaldialog.h
ui/keylistview.cpp
ui/keylistview.h
ui/keyrequester.cpp
ui/keyrequester.h
ui/keyselectioncombo.cpp
ui/keyselectioncombo.h
ui/keyselectiondialog.cpp
ui/keyselectiondialog.h
ui/newkeyapprovaldialog.cpp
ui/newkeyapprovaldialog.h
)
if(MINGW)
# we do not care about different signedness of passed pointer arguments
set_source_files_properties(utils/gnupg-registry.c PROPERTIES COMPILE_OPTIONS "-Wno-pointer-sign")
endif()
-target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo PUBLIC Gpgmepp PRIVATE Qt::Widgets
- KF${KF_MAJOR_VERSION}::I18n
- KF${KF_MAJOR_VERSION}::Completion
- KF${KF_MAJOR_VERSION}::ConfigCore
- KF${KF_MAJOR_VERSION}::ConfigWidgets
- KF${KF_MAJOR_VERSION}::CoreAddons
- KF${KF_MAJOR_VERSION}::WidgetsAddons
- KF${KF_MAJOR_VERSION}::ItemModels
- KF${KF_MAJOR_VERSION}::Codecs)
+target_link_libraries(KPim6Libkleo PUBLIC Gpgmepp PRIVATE Qt::Widgets
+ KF6::I18n
+ KF6::Completion
+ KF6::ConfigCore
+ KF6::ConfigWidgets
+ KF6::CoreAddons
+ KF6::WidgetsAddons
+ KF6::ItemModels
+ KF6::Codecs)
if (QT_MAJOR_VERSION STREQUAL "6")
- target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE Qt6::Core5Compat PUBLIC QGpgmeQt6)
+ target_link_libraries(KPim6Libkleo PRIVATE Qt6::Core5Compat PUBLIC QGpgmeQt6)
else()
- target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo PUBLIC QGpgme)
+ target_link_libraries(KPim6Libkleo PUBLIC QGpgme)
endif()
# Boost::headers may not be available for old versions of Boost
if (TARGET Boost::headers)
- target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE Boost::headers)
+ target_link_libraries(KPim6Libkleo PRIVATE Boost::headers)
endif()
-if (KPim${KF_MAJOR_VERSION}TextEdit_FOUND)
+if (KPim6TextEdit_FOUND)
add_definitions(-DHAVE_PIMTEXTEDIT)
- target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo PRIVATE KPim${KF_MAJOR_VERSION}::PimTextEdit)
+ target_link_libraries(KPim6Libkleo PRIVATE KPim6::PimTextEdit)
endif()
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
- set_target_properties(KPim${KF_MAJOR_VERSION}Libkleo PROPERTIES UNITY_BUILD ON)
+ set_target_properties(KPim6Libkleo PROPERTIES UNITY_BUILD ON)
endif()
-ecm_generate_export_header(KPim${KF_MAJOR_VERSION}Libkleo
+ecm_generate_export_header(KPim6Libkleo
BASE_NAME kleo
VERSION ${PIM_VERSION}
DEPRECATED_BASE_VERSION 0
DEPRECATION_VERSIONS 5.23
)
if(WIN32)
- target_link_libraries(KPim${KF_MAJOR_VERSION}Libkleo ${GPGME_VANILLA_LIBRARIES} )
+ target_link_libraries(KPim6Libkleo ${GPGME_VANILLA_LIBRARIES} )
endif()
-set_target_properties(KPim${KF_MAJOR_VERSION}Libkleo PROPERTIES
+set_target_properties(KPim6Libkleo PROPERTIES
VERSION ${LIBKLEO_VERSION}
SOVERSION ${LIBKLEO_SOVERSION}
EXPORT_NAME Libkleo
)
install(TARGETS
- KPim${KF_MAJOR_VERSION}Libkleo
- EXPORT KPim${KF_MAJOR_VERSION}LibkleoTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ KPim6Libkleo
+ EXPORT KPim6LibkleoTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
-target_include_directories(KPim${KF_MAJOR_VERSION}Libkleo INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo>")
-target_include_directories(KPim${KF_MAJOR_VERSION}Libkleo PUBLIC "$<BUILD_INTERFACE:${libkleo_SOURCE_DIR}/src;${libkleo_BINARY_DIR}/src>")
+target_include_directories(KPim6Libkleo INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo>")
+target_include_directories(KPim6Libkleo PUBLIC "$<BUILD_INTERFACE:${libkleo_SOURCE_DIR}/src;${libkleo_BINARY_DIR}/src>")
ecm_generate_headers(libkleo_CamelCase_HEADERS
HEADER_NAMES
AuditLogEntry
ChecksumDefinition
Debug
DefaultKeyFilter
DefaultKeyGenerationJob
DocAction
Dn
Enum
KConfigBasedKeyFilter
KeyFilter
KeyFilterManager
KeyGroup
KeyGroupConfig
KeyGroupImportExport
KeyResolver
KeyResolverCore
KeyserverConfig
KleoException
OidMap
Predicates
Stl_Util
REQUIRED_HEADERS libkleo_HEADERS
PREFIX Libkleo
RELATIVE kleo
)
ecm_generate_headers(libkleo_CamelCase_models_HEADERS
HEADER_NAMES
KeyCache
KeyList
KeyListModel
KeyListModelInterface
KeyListSortFilterProxyModel
KeyRearrangeColumnsProxyModel
SubkeyListModel
UserIDListModel
REQUIRED_HEADERS libkleo_models_HEADERS
PREFIX Libkleo
RELATIVE models
)
ecm_generate_headers(libkleo_CamelCase_utils_HEADERS
HEADER_NAMES
Algorithm
Assuan
Classify
Compat
Compliance
CryptoConfig
FileSystemWatcher
Formatting
GnuPG
Hex
KeyHelpers
QtStlHelpers
SCDaemon
StringUtils
SystemInfo
Test
UniqueLock
REQUIRED_HEADERS libkleo_utils_HEADERS
PREFIX Libkleo
RELATIVE utils
)
ecm_generate_headers(libkleo_CamelCase_ui_HEADERS
HEADER_NAMES
AuditLogViewer
CryptoConfigModule
DNAttributeOrderConfigWidget
DirectoryServicesWidget
EditDirectoryServiceDialog
FileNameRequester
KeyApprovalDialog
KeyListView
KeyRequester
KeySelectionCombo
KeySelectionDialog
MessageBox
NavigatableTreeView
NavigatableTreeWidget
NewKeyApprovalDialog
ProgressDialog
ReaderPortSelection
REQUIRED_HEADERS libkleo_ui_HEADERS
PREFIX Libkleo
RELATIVE ui
)
if (QT_MAJOR_VERSION STREQUAL "6")
ecm_generate_pri_file(BASE_NAME Libkleo
- LIB_NAME KPim${KF_MAJOR_VERSION}Libkleo
- DEPS "QGpgme" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo
+ LIB_NAME KPim6Libkleo
+ DEPS "QGpgme" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo
)
else()
ecm_generate_pri_file(BASE_NAME Libkleo
- LIB_NAME KPim${KF_MAJOR_VERSION}Libkleo
- DEPS "QGpgmeQt6" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo
+ LIB_NAME KPim6Libkleo
+ DEPS "QGpgmeQt6" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo
)
endif()
install(FILES
${libkleo_CamelCase_HEADERS}
${libkleo_CamelCase_models_HEADERS}
${libkleo_CamelCase_ui_HEADERS}
${libkleo_CamelCase_utils_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo/Libkleo
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo/Libkleo
COMPONENT Devel
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kleo_export.h
${libkleo_HEADERS}
${libkleo_models_HEADERS}
${libkleo_ui_HEADERS}
${libkleo_utils_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkleo/libkleo
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo/libkleo
COMPONENT Devel
)
install(FILES
${PRI_FILENAME}
DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
if ( WIN32 )
install ( FILES libkleopatrarc-win32.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
else ()
install ( FILES libkleopatrarc.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
endif ()
if (BUILD_QCH)
ecm_add_qch(
- KPim${KF_MAJOR_VERSION}Libkleo_QCH
- NAME KPim${KF_MAJOR_VERSION}Libkleo
- BASE_NAME KPim${KF_MAJOR_VERSION}Libkleo
+ KPim6Libkleo_QCH
+ NAME KPim6Libkleo
+ BASE_NAME KPim6Libkleo
VERSION ${PIM_VERSION}
ORG_DOMAIN org.kde
SOURCES # using only public headers, to cover only public API
${libkleo_HEADERS}
${libkleo_models_HEADERS}
${libkleo_ui_HEADERS}
${libkleo_utils_HEADERS}
#MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
#IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics"
LINK_QCHS
- Qt${QT_MAJOR_VERSION}Core_QCH
- Qt${QT_MAJOR_VERSION}Gui_QCH
- Qt${QT_MAJOR_VERSION}Widgets_QCH
+ Qt6Core_QCH
+ Qt6Gui_QCH
+ Qt6Widgets_QCH
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
BLANK_MACROS
KLEO_EXPORT
TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
COMPONENT Devel
)
endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3e89c7b6..3e33e886 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,24 +1,24 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
include(ECMMarkAsTest)
# Convenience macro to add kleo unit tests.
macro( add_kleo_test _source )
set( _test ${_source} )
get_filename_component( _name ${_source} NAME_WE )
add_executable( ${_name} ${_test} )
ecm_mark_as_test(kleo-${_name})
- target_link_libraries(${_name} KPim${KF_MAJOR_VERSION}::Libkleo Qt::Widgets KF${KF_MAJOR_VERSION}::CoreAddons
- KF${KF_MAJOR_VERSION}::I18n KF${KF_MAJOR_VERSION}::WidgetsAddons)
+ target_link_libraries(${_name} KPim6::Libkleo Qt::Widgets KF6::CoreAddons
+ KF6::I18n KF6::WidgetsAddons)
endmacro()
add_kleo_test(test_jobs.cpp)
add_kleo_test(test_cryptoconfig.cpp)
add_kleo_test(test_keyselectiondialog.cpp)
add_kleo_test(test_keygen.cpp)
add_kleo_test(test_keylister.cpp)
add_kleo_test(test_auditlog.cpp)
add_kleo_test(test_keyformailbox.cpp)
add_kleo_test(test_keyselectioncombo.cpp)
add_kleo_test(test_keyresolver.cpp)

File Metadata

Mime Type
text/x-diff
Expires
Fri, Mar 14, 4:15 AM (1 d, 6 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
91/fb/8a7bf0e1a2967cc5a614d8fb6750

Event Timeline