blob: bcfe31386103dd926af1b47cc0da559e35b11178 (
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
|
From af0ce63733e040d6220aaa2157190015d4a9b0fd Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Tue, 17 Mar 2020 22:45:20 +0000
Subject: [PATCH] Only require Qt5 when building the GUI
Commit 6c888437 made Qt5 mandatory for all builds when it is only
required for the GUI. There's already a find_package call in src/gui,
it just needed the REQUIRED flag to be added.
---
CMakeLists.txt | 6 ------
src/gui/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e10776e..ee0835ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -357,12 +357,6 @@ else()
set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
endif()
-
-# Check we have the *required* Qt5 libs.
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-
#
# Configure_file... but for directories, recursively.
#
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4988fe6a..f29fd910 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.4)
-find_package (Qt5 COMPONENTS Core Widgets Network)
+find_package (Qt5 REQUIRED COMPONENTS Core Widgets Network)
set (CMAKE_AUTOMOC ON)
set (CMAKE_AUTORCC ON)
set (CMAKE_AUTOUIC ON)
--
2.25.1
|
GitWeb
