From 48c82e90af12da74c713665ddfd7f8d825ae5bdb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 16 Jan 2020 10:42:05 +0100 Subject: Post Merge Fixes Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor --- src/network/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/network/CMakeLists.txt') diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 8b2753e6ff..7ebe37c064 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -5,14 +5,12 @@ # 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 ##################################################################### @@ -417,7 +415,13 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass + LIBRARIES + crypto_${CMAKE_SYSTEM_PROCESSOR} + ssl_${CMAKE_SYSTEM_PROCESSOR} +) + +qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID LIBRARIES OpenSSL::SSL ) -- cgit v1.2.3