blob: b096f82c93e0499f329b0933d71697f2f85f46a9 (
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
|
From cb9b5d87331a36dc4e80177bbd16c44444d0eb4d Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Wed, 8 Dec 2021 20:21:06 +0100
Subject: [PATCH] Use KDECompilerSettings instead of
KDEFrameworkCompilerSettings
The latter is only for KF modules to use.
GIT_SILENT
* asturmlechner 2022-04-15: Backport to 21.12.3
---
CMakeLists.txt | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0409983..cff6350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,9 @@ find_package (ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+
include(ECMInstallIcons)
include(ECMAddAppIcon)
@@ -32,8 +33,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Notifications
)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600)
+add_definitions(
+ -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00
+ -DQT_DEPRECATED_WARNINGS_SINCE=0x060000
+ -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800
+ -DKF_DEPRECATED_WARNINGS_SINCE=0x060000
+)
add_executable(ktimer)
--
GitLab
|
