diff options
| author | Frank Su <Fsu0413@vip.qq.com> | 2021-12-26 11:09:59 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-06 06:56:35 +0000 |
| commit | ae84abe0c1c398de24b3cd014f66bd6a05b095f2 (patch) | |
| tree | cc32673886dda13378c859e62c07b8cec6df8753 | |
| parent | 2476aede8743c0edeed5d9d25517e19f5cb55ed7 (diff) | |
CMake: link OpenSSL to openssl tls backend instead of QtNetwork
TLS backend has become plugins since Qt 6.2.
QtNetwork does not need these links anymore.
Also removes unnecessary condition since openssl tls backend is enabled
only if OpenSSL is enabled.
Change-Id: I4cc0422531d567ad015f9648fbb2bcd51f634cb9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f19ce3898e0257dac1112754b1a84c24486bda01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/network/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/plugins/tls/openssl/CMakeLists.txt | 13 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 45d275d1ce..774b5ae614 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -337,20 +337,6 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_opens ssl/qocsp_p.h ) -qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl - LIBRARIES - WrapOpenSSL::WrapOpenSSL - PRIVATE_MODULE_INTERFACE - WrapOpenSSL::WrapOpenSSL -) - -qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked - LIBRARIES - WrapOpenSSLHeaders::WrapOpenSSLHeaders - PRIVATE_MODULE_INTERFACE - WrapOpenSSLHeaders::WrapOpenSSLHeaders -) - qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID SOURCES kernel/qdnslookup_unix.cpp diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt index 0a35d5888b..a7fb54f08c 100644 --- a/src/plugins/tls/openssl/CMakeLists.txt +++ b/src/plugins/tls/openssl/CMakeLists.txt @@ -40,11 +40,20 @@ qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION ANDROID qsslsocket_openssl_android.cpp ) -qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_openssl - AND QT_FEATURE_ssl AND WIN32 +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION WIN32 SOURCES qwindowscarootfetcher.cpp qwindowscarootfetcher_p.h ../shared/qwincrypt_p.h LIBRARIES crypt32 ) + +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_openssl_linked + LIBRARIES + WrapOpenSSL::WrapOpenSSL +) + +qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION NOT QT_FEATURE_openssl_linked + LIBRARIES + WrapOpenSSLHeaders::WrapOpenSSLHeaders +) |