diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /src/network/CMakeLists.txt | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
| -rw-r--r-- | src/network/CMakeLists.txt | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index facd95c9ec..8b2753e6ff 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,5 +1,20 @@ # Generated from network.pro. +# special case begin +# Temporary fix for OpenSSL feature detection until we can provide a +# proper implementation of additional compile tests for library dependencies +# in configure.json + +if (UNIX OR ANDROID) +find_package(OpenSSL) +if (NOT OPENSSL_FOUND OR NOT OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0") + set(QT_FEATURE_openssl_runtime OFF CACHE BOOL "" FORCE) + set(QT_FEATURE_openssl_linked OFF CACHE BOOL "" FORCE) + set(QT_FEATURE_openssl OFF CACHE BOOL "" FORCE) +endif() +endif() +# special case end + ##################################################################### ## Network Module: ##################################################################### @@ -378,6 +393,8 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl ssl/qsslkey_openssl.cpp ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h + DEFINES + OPENSSL_API_COMPAT=0x10100000L ) qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl @@ -390,22 +407,6 @@ qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT ssl/qocsp_p.h ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl - SOURCES - ssl/qsslcontext_openssl11.cpp - ssl/qsslsocket_openssl11.cpp - ssl/qsslsocket_openssl11_symbols_p.h - DEFINES - OPENSSL_API_COMPAT=0x10100000L -) - -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11 - SOURCES - ssl/qsslcontext_opensslpre11.cpp - ssl/qsslsocket_opensslpre11.cpp - ssl/qsslsocket_opensslpre11_symbols_p.h -) - qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES ssl/qsslsocket_mac_shared.cpp |