diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b82eb066..c5e4ac681 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,88 +1,88 @@ cmake_minimum_required(VERSION 3.0) project(kdeplasma-addons) set(PROJECT_VERSION "5.12.80") set(PROJECT_VERSION_MAJOR 5) ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "plasma requires an out of source build. Please create a separate build directory and run 'cmake path_to_plasma [options]' there.") endif() -set(REQUIRED_QT_VERSION 5.9.0) +set(QT_MIN_VERSION 5.9.0) set(KF5_MIN_VERSION 5.45.0) include(FeatureSummary) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMInstallIcons) include(GenerateExportHeader) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Gui DBus Quick Qml Widgets ) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive Config CoreAddons I18n IconThemes KIO KCMUtils Kross Notifications Plasma Runner Service Sonnet UnitConversion WindowSystem NewStuff ) find_package(KF5Purpose CONFIG QUIET) set_package_properties(KF5Purpose PROPERTIES DESCRIPTION "Framework for cross-application services and actions" PURPOSE "Needed for QuickShare applet" URL "https://commits.kde.org/purpose" TYPE RUNTIME ) add_definitions( -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_STRICT_ITERATORS -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_SIGNALS_SLOTS_KEYWORDS ) ######################################################################### ################# list the subdirectories ################# add_subdirectory(libs) add_subdirectory(applets) add_subdirectory(dataengines) add_subdirectory(runners) add_subdirectory(wallpapers) add_subdirectory(windowswitchers) add_subdirectory(desktopswitchers) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/applets/dict/CMakeLists.txt b/applets/dict/CMakeLists.txt index 41eea832d..36bf7b9ae 100644 --- a/applets/dict/CMakeLists.txt +++ b/applets/dict/CMakeLists.txt @@ -1,44 +1,44 @@ -find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG) +find_package(Qt5WebEngine ${QT_MIN_VERSION} CONFIG) set_package_properties(Qt5WebEngine PROPERTIES PURPOSE "Needed by the dict applet" URL "https://doc.qt.io/qt-5/qtwebengine-index.html" TYPE OPTIONAL ) if (Qt5WebEngine_FOUND) ####################################################################################### # Package (metadata.desktop and QML) plasma_install_bundled_package(package org.kde.plasma_applet_dict) ####################################################################################### # Icon for the package ecm_install_icons( ICONS sc-apps-accessories-dictionary.svgz DESTINATION ${KDE_INSTALL_ICONDIR} ) ####################################################################################### # C++ Plugin add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.dict") set(dict_SRCS plugin/dict_plugin.cpp plugin/dict_object.cpp plugin/dictionariesmodel.cpp ) add_library(dictplugin SHARED ${dict_SRCS}) target_link_libraries(dictplugin KF5::Plasma KF5::I18n Qt5::Quick Qt5::WebEngine ) install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/dict) install(TARGETS dictplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/dict) endif() diff --git a/applets/webbrowser/CMakeLists.txt b/applets/webbrowser/CMakeLists.txt index 183195ea3..b3042caea 100644 --- a/applets/webbrowser/CMakeLists.txt +++ b/applets/webbrowser/CMakeLists.txt @@ -1,13 +1,13 @@ -find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG) +find_package(Qt5WebEngine ${QT_MIN_VERSION} CONFIG) set_package_properties(Qt5WebEngine PROPERTIES PURPOSE "Needed by the web browser applet" URL "https://doc.qt.io/qt-5/qtwebengine-index.html" TYPE OPTIONAL ) if (Qt5WebEngine_FOUND) plasma_install_bundled_package(package org.kde.plasma.webbrowser) endif()