diff options
| -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 +) |