mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-27 02:45:34 +02:00
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
From 420b3e5ac2e91b7a99488ac34577e2798a84a68c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
|
||
|
|
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
|
||
|
|
Date: Tue, 6 Aug 2024 17:35:56 -0400
|
||
|
|
Subject: [PATCH] qtbase: fix CMake error
|
||
|
|
|
||
|
|
For more information, see:
|
||
|
|
https://github.com/qt/qtbase/commit/3411f2984a5325a35e3bed1f961e5973d8a565b9
|
||
|
|
---
|
||
|
|
qtbase/configure.cmake | 1 +
|
||
|
|
qtbase/src/corelib/CMakeLists.txt | 1 -
|
||
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/qtbase/configure.cmake b/qtbase/configure.cmake
|
||
|
|
index 43de2aa026..37a82dcdb6 100644
|
||
|
|
--- a/qtbase/configure.cmake
|
||
|
|
+++ b/qtbase/configure.cmake
|
||
|
|
@@ -18,6 +18,7 @@ if(TARGET ZLIB::ZLIB)
|
||
|
|
set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
+qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
|
||
|
|
qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME core)
|
||
|
|
# openssl_headers
|
||
|
|
# OPENSSL_VERSION_MAJOR is not defined for OpenSSL 1.1.1
|
||
|
|
diff --git a/qtbase/src/corelib/CMakeLists.txt b/qtbase/src/corelib/CMakeLists.txt
|
||
|
|
index 31b81734e8..b62e2f763b 100644
|
||
|
|
--- a/qtbase/src/corelib/CMakeLists.txt
|
||
|
|
+++ b/qtbase/src/corelib/CMakeLists.txt
|
||
|
|
@@ -1,7 +1,6 @@
|
||
|
|
# Copyright (C) 2022 The Qt Company Ltd.
|
||
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
||
|
|
|
||
|
|
-qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
|
||
|
|
qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2)
|
||
|
|
qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|