diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-18 10:54:10 +0200 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-18 13:30:57 +0000 |
commit | bb7fa0b9a006161f7cf63833595191865db69bc5 (patch) | |
tree | d95033104dd1c76607b6cf836a9b3486bc634a7f /tests/auto/network | |
parent | 68296aaed44710f38e925085e95a503fc679ef7c (diff) | |
download | qtbase-bb7fa0b9a006161f7cf63833595191865db69bc5.tar.gz |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/CMakeLists.txt | 14 |
1 files changed, 14 insertions, 0 deletions
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($<TARGET_PROPERTY:OpenSSL::SSL,INTERFACE_INCLUDE_DIRECTORIES>) + endif() + + if (QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked) + include_directories($<TARGET_PROPERTY:OpenSSL::SSL_nolink,INTERFACE_INCLUDE_DIRECTORIES>) + endif() +endif() +# special case end add_subdirectory(access) add_subdirectory(bearer) |