From f1f1668394fd9816bfd5e7b0d08729df58aac24e Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Tue, 10 May 2022 06:18:33 +0200
Subject: [PATCH] Slightly bump KF5 requirements, fix ECM_FIND_VERSION checks,
 move basic ECM includes to top

Now we need to explicitly set the KDE_COMPILERSETTINGS_LEVEL variable.
---
 CMakeLists.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55ce49bc1..7b09fcc67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,25 @@ set(BUG_ADDRESS "https://bugs.kde.org/enter_bug.cgi?product=lattedock")
 set(FAQS "https://userbase.kde.org/LatteDock/FAQ")
 
 set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.82.0")
+set(KF5_MIN_VERSION "5.88.0")
+set(KDE_COMPILERSETTINGS_LEVEL "5.84.0")
 
 set(KF5_LOCALE_PREFIX "")
 
-find_package(ECM ${KF5_MIN_VER} REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
+include(KDEInstallDirs)
+include(CheckIncludeFiles)
+include(CMakePackageConfigHelpers)
+include(ECMOptionalAddSubdirectory)
+include(ECMQtDeclareLoggingCategory)
+include(KDECMakeSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEPackageAppTemplates)
+include(WriteBasicConfigVersionFile)
+
+
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
@@ -69,16 +81,6 @@ ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
 ecm_find_qmlmodule(org.kde.plasma.core 2.0)
 ecm_find_qmlmodule(org.kde.plasma.components 2.0)
 
-include(CheckIncludeFiles)
-include(CMakePackageConfigHelpers)
-include(ECMOptionalAddSubdirectory)
-include(ECMQtDeclareLoggingCategory)
-include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
-include(KDEInstallDirs)
-include(KDEPackageAppTemplates)
-include(WriteBasicConfigVersionFile)
-
 include(Definitions.cmake)
 
 #hide warnings