From bb7fa0b9a006161f7cf63833595191865db69bc5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 18 Oct 2019 10:54:10 +0200 Subject: [PATCH] Fix OpenSSL include path for QtNetwork private tests On platforms which use OpenSSL that is not installed in a standard directory, e.g: android + vcpkg, private tests would fail to resolve the include for OpenSSL. Change-Id: I57ce6a83e3bc9a232d4285530f8619ffbfdf2f77 Reviewed-by: Simon Hausmann --- tests/auto/network/CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/auto/network/CMakeLists.txt b/tests/auto/network/CMakeLists.txt index 9ae48630cb..59188717e8 100644 --- a/tests/auto/network/CMakeLists.txt +++ b/tests/auto/network/CMakeLists.txt @@ -1,4 +1,18 @@ # Generated from network.pro. +# special case begin +# SSL library include path is not propagated with private tests which results in +# test not being able to find the ssl header when they are not in the standard +# include paths +if (QT_FEATURE_private_tests) + if (QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl) + include_directories($) + endif() + + if (QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked) + include_directories($) + endif() +endif() +# special case end add_subdirectory(access) add_subdirectory(bearer)