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/.prev_CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/network/.prev_CMakeLists.txt') diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 87bf4cefe3..a26fb735db 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -402,7 +402,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