diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-27 20:19:07 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-30 23:17:50 +0100 |
| commit | 5592204b19a5dc46e308cc31ac035edb78d2d8fd (patch) | |
| tree | dfd1911ab677487e1f5dfce6d66cce18a0a6c784 /src/network | |
| parent | b71c04353dc72e0fb6d384e0d5845524f1547f88 (diff) | |
CMake: Fix QMAKE_LIB of WrapOpenSSLHeaders library
The correct entry for this lib is 'openssl/nolink', not
'openssl_headers'.
In configurejson2cmake's helper.py we already have
this information encoded such that the no_link_so_name field of
'openssl' points to 'openssl_headers'. Extend configurejson2cmake to
take this into account, and re-generate src/network/configure.cmake.
Pick-to: 6.0
Change-Id: I9817ea7722503a373d309b7e6fa201448d403e8d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/configure.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index ea71cd1ff8..b3c9087127 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -8,7 +8,7 @@ qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli) qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy) -qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME network QMAKE_LIB openssl_headers) +qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME network QMAKE_LIB openssl/nolink) # openssl_headers qt_config_compile_test(openssl_headers LIBRARIES |