X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/af77a3f5a8240599c1c7e0d07a2a3a485ca1af02..c8d69d27050ab83339aa41f2d5baf26f5bfb1c31:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index eb3623e9b..b5046c33a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,19 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script -set (RELEASE_SERVICE_VERSION_MAJOR "24") +set (RELEASE_SERVICE_VERSION_MAJOR "25") set (RELEASE_SERVICE_VERSION_MINOR "11") set (RELEASE_SERVICE_VERSION_MICRO "70") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) set(QT_MIN_VERSION "6.4.0") -set(KF6_MIN_VERSION "6.2.0") +set(KF6_MIN_VERSION "6.9.0") + +# use C++20 like KF6 itself +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) # ECM setup find_package(ECM ${KF6_MIN_VERSION} CONFIG REQUIRED) @@ -53,6 +58,10 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS DBus ) +if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0") + find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +endif() + if (UNIX AND NOT APPLE AND NOT HAIKU) set(HAVE_X11 TRUE) endif() @@ -77,6 +86,7 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS WidgetsAddons Codecs GuiAddons + ColorScheme ) find_package(KF6UserFeedback ${KF6_MIN_VERSION}) @@ -93,8 +103,6 @@ find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS DocTools ) -find_package(Phonon4Qt6 CONFIG REQUIRED) - find_package(PackageKitQt6) set_package_properties(PackageKitQt6 PROPERTIES DESCRIPTION "Software Manager integration" @@ -128,7 +136,12 @@ set_package_properties(KF6BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets" if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND) message(STATUS "Baloo packages are found") set(HAVE_BALOO TRUE) -else() + + find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Multimedia + MultimediaWidgets + ) +else () message(WARNING "Baloo packages not found. They are needed for the metadata features of Dolphin (including the information panel).") endif()