diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0f8171..170eb417 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,69 +1,73 @@ cmake_minimum_required(VERSION 3.5) set(PIM_VERSION "5.11.2") project(Akonadi-Contact VERSION ${PIM_VERSION}) # ECM setup set(KF5_MIN_VERSION "5.56.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) set(AKONADI_CONTACTS_VERSION ${PIM_VERSION}) set(KCONTACTS_VERSION "5.11.1") set(KMIMELIB_VERSION "5.11.1") set(AKONADI_VERSION "5.11.1") set(QT_REQUIRED_VERSION "5.10.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) ########### Find packages ########### find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIMELIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) ########### Targets ########### # workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) if (${Qt5Widgets_VERSION} STRGREATER "5.13") MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") else() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) endif() add_definitions(-DQT_NO_URL_CAST_FROM_STRING) if(BUILD_TESTING) add_definitions(-DBUILD_TESTING) endif() add_subdirectory(src) add_subdirectory(kcm) add_subdirectory(serializers) install( FILES akonadi-contacts.renamecategories akonadi-contacts.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/akonadi-contacts/KF5AkonadiContactConfig.cmake.in b/src/akonadi-contacts/KF5AkonadiContactConfig.cmake.in index 61d16fba..dfe7c19e 100644 --- a/src/akonadi-contacts/KF5AkonadiContactConfig.cmake.in +++ b/src/akonadi-contacts/KF5AkonadiContactConfig.cmake.in @@ -1,8 +1,8 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) find_dependency(KF5Akonadi "@AKONADI_VERSION@") find_dependency(KF5Contacts "@KCONTACTS_VERSION@") -find_dependency(KF5ContactEditor "@PIM_VERSION@") +find_dependency(Qt5Widgets "@QT_REQUIRED_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiContactTargets.cmake") diff --git a/src/contact-editor/KF5ContactEditorConfig.cmake.in b/src/contact-editor/KF5ContactEditorConfig.cmake.in index aedac6e4..5f3ee03b 100644 --- a/src/contact-editor/KF5ContactEditorConfig.cmake.in +++ b/src/contact-editor/KF5ContactEditorConfig.cmake.in @@ -1,6 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) find_dependency(KF5Contacts "@KCONTACTS_VERSION@") +find_dependency(Qt5Widgets "@QT_REQUIRED_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5ContactEditorTargets.cmake")