1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: link OpenSSL to openssl tls backend instead of QtNetwork

Browse Source 
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.

Pick-to: 6.2 6.3
Change-Id: I4cc0422531d567ad015f9648fbb2bcd51f634cb9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Frank Su 2021-12-26 11:09:59 +08:00
parent 8efe2d54b7
commit f19ce3898e
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/CMakeLists.txt
View File

@ -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

13
src/plugins/tls/openssl/CMakeLists.txt
View File

@ -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
)