X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/522000ad8d8caafb0dc192308b876d23cae55048..ce7852fb2352155e4373f9a41f0a01549985bd45:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4336205fc..1a346b8f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,23 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "21")
-set (RELEASE_SERVICE_VERSION_MINOR "07")
+set (RELEASE_SERVICE_VERSION_MAJOR "22")
+set (RELEASE_SERVICE_VERSION_MINOR "03")
 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 "5.14.0")
-set(KF5_MIN_VERSION "5.77.0")
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(QT_MIN_VERSION "5.15.0")
+set(KF5_MIN_VERSION "5.91.0")
 
 # ECM setup
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMGenerateDBusServiceFile)
@@ -24,10 +25,8 @@ include(ECMConfiguredInstall)
 include(CMakePackageConfigHelpers)
 include(GenerateExportHeader)
 include(FeatureSummary)
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
 
 ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
@@ -43,7 +42,7 @@ ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
                   SOVERSION 5
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     Concurrent
     Widgets
@@ -52,7 +51,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-    DocTools
     KCMUtils
     NewStuff
     CoreAddons
@@ -83,6 +81,7 @@ endif()
 
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
+    DocTools
 )
 set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities libraries"
                        URL "https://www.kde.org"
@@ -90,7 +89,7 @@ set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities librari
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
                       )
 
-find_package(Phonon4Qt5 CONFIG REQUIRED)
+find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED)
 
 find_package(PackageKitQt5)
 set_package_properties(PackageKitQt5
@@ -140,6 +139,12 @@ else()
     set(HAVE_TERMINAL TRUE)
 endif()
 
+ecm_set_disabled_deprecation_versions(SHOW_DEPRECATIONS
+    QT 5.15
+    KF 5.90
+    KSERVICE 5.89 # We use KServiceTypeTrader in a compat code path
+)
+
 add_subdirectory(src)
 add_subdirectory(doc)
 
@@ -170,15 +175,24 @@ install(FILES
     COMPONENT Devel
 )
 
-ecm_generate_dbus_service_file(
-   NAME org.freedesktop.FileManager1
-   EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon"
-   SYSTEMD_SERVICE plasma-dolphin.service
-   DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
-   RENAME org.kde.dolphin.FileManager1.service
-)
+if(FLATPAK)
+    ecm_generate_dbus_service_file(
+        NAME org.freedesktop.FileManager1
+        EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon"
+        SYSTEMD_SERVICE plasma-dolphin.service
+        DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+    )
+else()
+    ecm_generate_dbus_service_file(
+        NAME org.freedesktop.FileManager1
+        EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon"
+        SYSTEMD_SERVICE plasma-dolphin.service
+        DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+        RENAME org.kde.dolphin.FileManager1.service
+    )
+endif()
 
-ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
 
 ecm_qt_install_logging_categories(
         EXPORT DOLPHIN