diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-27 20:19:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-01 03:38:41 +0000 |
| commit | c765b8f280352a7f3262ad3ad992f2dea41985d7 (patch) | |
| tree | 82dea6295fe193580d06dc261a2813c0d827b542 /.prev_configure.cmake | |
| parent | be01af7c343cdf7ea1bd6604bc3fa0a1f6ce6419 (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.
Change-Id: I9817ea7722503a373d309b7e6fa201448d403e8d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5592204b19a5dc46e308cc31ac035edb78d2d8fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.prev_configure.cmake')
| -rw-r--r-- | .prev_configure.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.prev_configure.cmake b/.prev_configure.cmake index 3390c85588..b0a133bcb3 100644 --- a/.prev_configure.cmake +++ b/.prev_configure.cmake @@ -643,7 +643,7 @@ qt_feature("enable_gdb_index" qt_feature_config("enable_gdb_index" QMAKE_PRIVATE_CONFIG) qt_feature("reduce_exports" PRIVATE LABEL "Reduce amount of exported symbols" - CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY + CONDITION NOT MSVC ) qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE") qt_feature_config("reduce_exports" QMAKE_PUBLIC_QT_CONFIG) |