diff options
| -rw-r--r-- | configure.cmake | 4 | ||||
| -rw-r--r-- | src/corelib/CMakeLists.txt | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index cbfe142069..3d9288122b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -18,6 +18,10 @@ if(TARGET ZLIB::ZLIB) set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE) endif() +# Look for Threads in the same scope as OpenSSL package, because OpenSSL sometimes depends on +# Threads (for static OpenSSL builds) and we want to promote the target to global in the same +# directory scope. +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/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 96eb47dc35..1296ff0408 100644 --- a/src/corelib/CMakeLists.txt +++ b/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) |