summaryrefslogtreecommitdiff
path: root/kde-apps/kmouth/files/kmouth-21.12.3-use-KDECompilerSettings.patch
blob: b57440c53477e9858f52e34284942dee3c589d6f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From cfb889ab38befe1e378d92ab9915aed14ec5843b Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Wed, 8 Dec 2021 20:29:29 +0100
Subject: [PATCH] Use KDECompilerSettings instead of
 KDEFrameworkCompilerSettings

The latter is only for KF modules to use.

Also include the KDE cmake modules as first thing, as their settings
can influence other included macros.

GIT_SILENT
---
 CMakeLists.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b89f16..42f1b5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,18 +14,25 @@ set(QT_MIN_VERSION "5.15.0")
 set(KF5_MIN_VERSION "5.85.0")
 
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core PrintSupport TextToSpeech Xml Widgets)
-
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
-include(ECMAddAppIcon)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+
+include(ECMAddAppIcon)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+    Core
+    PrintSupport
+    TextToSpeech
+    Xml
+    Widgets
+)
+
 find_package(KF5  ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Crash
     Completion
-- 
GitLab