diff --git a/CMakeLists.txt b/CMakeLists.txt index eef4e9c..eb4fcbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,57 +1,57 @@ project(plymouthkcm) cmake_minimum_required(VERSION 2.8.12) -set(KF5_MIN_VERSION "5.54.0") +set(KF5_MIN_VERSION "5.56.0") set(QT_MIN_VERSION "5.11.0") ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "plymouthkcm requires an out of source build. Please create a separate build directory and run 'cmake path_to_kirigami [options]' there.") endif() # Make CPack available to easy generate binary packages include(CPack) include(FeatureSummary) ################# set KDE specific information ################# set(PROJECT_VERSION "5.15.80") set(PROJECT_VERSION_MAJOR 5) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMSetupVersion) include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui ) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive NewStuff NewStuffCore KIO Declarative I18n Config ConfigWidgets) add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) ################# Enable C++11 features for clang and gcc ################# if(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") endif() ################# now find all used packages ################# find_package(Plymouth REQUIRED) add_subdirectory(src) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 318cb7d..941d7d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,61 +1,61 @@ # KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"kcm_plymouth\") SET(PLYMOUTH_THEMES_DIR "/usr/share/plymouth/themes/" CACHE STRING "Where Plymouth themes are installed") SET(PLYMOUTH_CONFIG_PATH "/etc/plymouth/plymouthd.conf" CACHE STRING "where the main plymouth config file is") set(PLYMOUNT_KCM_VERSION ${PROJECT_VERSION}) configure_file (config-kcm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcm.h ) set(kcm_plymouth_SRCS kcm.cpp ) add_library(kcm_plymouth MODULE ${kcm_plymouth_SRCS}) target_link_libraries(kcm_plymouth KF5::CoreAddons - KF5::Auth + KF5::AuthCore KF5::I18n KF5::Declarative KF5::QuickAddons KF5::NewStuff KF5::NewStuffCore KF5::ConfigCore KF5::KIOCore Qt5::Widgets ${X11_LIBRARIES} ) kcoreaddons_desktop_to_json(kcm_plymouth "kcm_plymouth.desktop" SERVICE_TYPES kcmodule.desktop) #this desktop file is installed only for retrocompatibility with sycoca install(FILES kcm_plymouth.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(TARGETS kcm_plymouth DESTINATION ${PLUGIN_INSTALL_DIR}/kcms) install(FILES plymouth.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) kpackage_install_package(package kcm_plymouth kcms) #installer tool for knewstuff add_executable(kplymouththemeinstaller kplymouththemeinstaller.cpp ) target_link_libraries(kplymouththemeinstaller KF5::I18n - KF5::Auth + KF5::AuthCore KF5::CoreAddons KF5::Archive KF5::ConfigCore) install(TARGETS kplymouththemeinstaller ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) #polkit stuff add_executable(plymouthhelper helper.cpp ${helper_mocs}) target_link_libraries(plymouthhelper KF5::Archive - KF5::Auth + KF5::AuthCore KF5::ConfigCore KF5::I18n) install(TARGETS plymouthhelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) kauth_install_helper_files(plymouthhelper org.kde.kcontrol.kcmplymouth root) kauth_install_actions(org.kde.kcontrol.kcmplymouth kcmplymouth_actions.actions)