diff --git a/CMakeLists.txt b/CMakeLists.txt index b0a7179..60f939f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,32 +1,32 @@ project(user-manager) cmake_minimum_required(VERSION 2.8.12) set(PROJECT_VERSION "5.15.80") set(QT_MIN_VERSION "5.11.0") -set(KF5_MIN_VERSION "5.54.0") +set(KF5_MIN_VERSION "5.56.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets DBus) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED WidgetsAddons CoreAddons I18n Config ConfigWidgets KCMUtils KIO IconThemes Auth) find_package(PWQuality REQUIRED) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include_directories(${PWQUALITY_INCLUDE_DIR}) # Set KI18n translation domain add_definitions(-DTRANSLATION_DOMAIN=\"user_manager\") add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) add_subdirectory(src) install( FILES user-manager.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b8d391..a7e31cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,66 +1,66 @@ set(user_manager_SRCS lib/accountmodel.cpp lib/modeltest.cpp lib/usersessions.cpp usermanager.cpp accountinfo.cpp createavatarjob.cpp passworddialog.cpp passwordedit.cpp avatargallery.cpp ) set_source_files_properties(lib/org.freedesktop.Accounts.xml PROPERTIES NO_NAMESPACE TRUE) set_source_files_properties(lib/org.freedesktop.Accounts.User.xml PROPERTIES NO_NAMESPACE TRUE) qt5_add_dbus_interface(user_manager_SRCS lib/org.freedesktop.Accounts.xml accounts_interface ) qt5_add_dbus_interface(user_manager_SRCS lib/org.freedesktop.Accounts.User.xml user_interface ) set(login1_manager_xml lib/org.freedesktop.login1.Manager.xml) set_source_files_properties(${login1_manager_xml} PROPERTIES INCLUDE "lib/usersessions.h") qt5_add_dbus_interface(user_manager_SRCS ${login1_manager_xml} login1_interface ) ki18n_wrap_ui(user_manager_SRCS kcm.ui account.ui password.ui avatargallery.ui) ecm_qt_declare_logging_category(user_manager_SRCS HEADER user_manager_debug.h IDENTIFIER USER_MANAGER_LOG CATEGORY_NAME log_user_manager) add_library(user_manager MODULE ${user_manager_SRCS}) target_link_libraries(user_manager Qt5::Core Qt5::Widgets Qt5::DBus - KF5::Auth + KF5::AuthCore KF5::WidgetsAddons KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::ConfigWidgets KF5::KCMUtils KF5::KIOCore KF5::IconThemes ${PWQUALITY_LIBRARY} ) if (NOT APPLE) target_link_libraries(user_manager crypt) endif() install(TARGETS user_manager DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES user_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(DIRECTORY pics/ DESTINATION ${DATA_INSTALL_DIR}/user-manager/avatars)