blob: f25dd6306afa00869c49672180c32884f2748f07 (
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
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt5 detection
---
core/CMakeLists.txt | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c04ee1a9c3..c3762437e6 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
)
if(ENABLE_QWEBENGINE)
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
else()
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
endif()
-find_package(Qt5 ${QT_MIN_VERSION}
- OPTIONAL_COMPONENTS
- DBus
- OpenGL
-)
+find_package(Qt5DBus ${QT_MIN_VERSION})
+
+find_package(Qt5OpenGL ${QT_MIN_VERSION})
if(ENABLE_DBUS)
if(NOT Qt5DBus_FOUND)
@@ -156,14 +154,10 @@ endif()
# Dependencies For unit tests and CLI test tools
if(BUILD_TESTING)
- find_package(Qt5 ${QT_MIN_VERSION}
- NO_MODULE COMPONENTS
- Test
- )
- find_package(Qt5 ${QT_MIN_VERSION}
- OPTIONAL_COMPONENTS
- Qml WebView # Optional, for 'sialis' O2 library test tool.
- )
+ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
+ # Optional, for 'sialis' O2 library test tool.
+ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
+ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
endif()
find_package(KF5 ${KF5_MIN_VERSION}
@@ -335,7 +329,7 @@ endif()
find_package(X11)
if(X11_FOUND)
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
+ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
set(HAVE_X11 TRUE)
else()
set(HAVE_X11 FALSE)
--
2.22.0
|
GitWeb
