diff --git a/CMakeLists.txt b/CMakeLists.txt index b86eb12..3584bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,78 +1,71 @@ project(sddm-kcm) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(PROJECT_VERSION "5.16.80") set(QT_MIN_VERSION "5.12.0") set(KF5_MIN_VERSION "5.58.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(ECMInstallIcons) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(FeatureSummary) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X11Extras Quick QuickWidgets) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets Quick QuickWidgets) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n XmlGui Auth ConfigWidgets KIO Archive NewStuff ) -find_package(X11) -set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" - URL "http://www.x.org" - TYPE REQUIRED - PURPOSE "Required for building the X11 based workspace" - ) - find_package(XCB REQUIRED COMPONENTS XCB SHM IMAGE OPTIONAL_COMPONENTS XKB ) if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) endif() add_definitions(-DTRANSLATION_DOMAIN=\"kcm_sddm\") add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) install(FILES kcm_sddm.desktop DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR}) kauth_install_actions(org.kde.kcontrol.kcmsddm kcm_sddm.actions) add_executable(kcmsddm_authhelper sddmauthhelper.cpp) target_link_libraries(kcmsddm_authhelper KF5::AuthCore KF5::ConfigCore KF5::Archive KF5::I18n) kauth_install_helper_files(kcmsddm_authhelper org.kde.kcontrol.kcmsddm root) install(TARGETS kcmsddm_authhelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) #installer tool for knewstuff add_executable(sddmthemeinstaller sddmthemeinstaller.cpp ) target_link_libraries(sddmthemeinstaller KF5::I18n KF5::AuthCore KF5::CoreAddons KF5::ConfigCore KF5::WidgetsAddons) install(TARGETS sddmthemeinstaller ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) add_subdirectory(src) install(FILES sddmtheme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1dce208..6ba125d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,48 +1,47 @@ set(SDDM_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") set(SDDM_CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory") set(SDDM_SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") set(XSESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/xsessions" CACHE PATH "Path of the xsessions") set(WAYLAND_SESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/wayland-sessions" CACHE PATH "Path of the wayland sessions") configure_file(config.h.in config.h IMMEDIATE @ONLY) # add_subdirectory(configwidgets) include_directories(configwidgets) set(SDDM_KCM_SRCS sddmkcm.cpp themeconfig.cpp themesmodel.cpp thememetadata.cpp themesdelegate.cpp advancedconfig.cpp usersmodel.cpp sessionmodel.cpp configwidgets/selectimagebutton.cpp ) set(SDDM_KCM_UI ui/themeconfig.ui ui/advancedconfig.ui) ki18n_wrap_ui(SDDM_KCM_SRCS ${SDDM_KCM_UI}) add_library(kcm_sddm MODULE ${SDDM_KCM_SRCS}) target_compile_definitions(kcm_sddm PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}") target_link_libraries(kcm_sddm Qt5::Widgets - Qt5::X11Extras Qt5::Quick Qt5::QuickWidgets KF5::I18n KF5::ConfigWidgets KF5::AuthCore KF5::KIOWidgets KF5::NewStuff ) install(TARGETS kcm_sddm DESTINATION ${CMAKE_INSTALL_PLUGINDIR}) install(FILES qml/main.qml DESTINATION ${CMAKE_INSTALL_DATADIR}/sddm-kcm)