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
|
From e4a8724c639275ec1339076e656fce322cb78ea1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 27 Dec 2024 11:19:05 +0100
Subject: [PATCH 08/13] CMake: Use 'COMPONENTS' syntax for Qt5 components.
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
CMakeLists.txt | 6 +-----
common/auxdb/CMakeLists.txt | 3 +--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dddfff4..ea6a7cc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(GNUInstallDirs)
-find_package(Qt5Core)
-find_package(Qt5Qml)
-find_package(Qt5Quick)
-find_package(Qt5Concurrent)
-find_package(Qt5QuickControls2)
+find_package(Qt5 COMPONENTS Core Qml Quick Concurrent QuickControls2 REQUIRED)
# Automatically create moc files
set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/common/auxdb/CMakeLists.txt b/common/auxdb/CMakeLists.txt
index b958e5bd..59079ee6 100644
--- a/common/auxdb/CMakeLists.txt
+++ b/common/auxdb/CMakeLists.txt
@@ -1,5 +1,4 @@
-find_package(Qt5Sql REQUIRED)
-find_package(Qt5DBus REQUIRED)
+find_package(Qt5 COMPONENTS Core Sql DBus REQUIRED)
set(SOURCES
auxdb.cpp
--
2.39.5
|
