diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-14 13:22:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-18 15:34:43 +0000 |
| commit | 4f1a155909dfcba7353ebe9eee669d65336bd943 (patch) | |
| tree | bbb0dac09548c61b119b92827a6fcbfd41fdc442 /src/network/configure.cmake | |
| parent | 37b154858f41c0aa32ad124878fae96c39563d39 (diff) | |
Regenerate cmake files from configure.json files
The new files represent the json features more closely.
This helps with various build issues as well, like dynamicgl
feature not being present before.
Change-Id: I433592f48e0550700226a635492a3ce15af743c1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/network/configure.cmake')
| -rw-r--r-- | src/network/configure.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index e2c4d20d63..38a3ff3099 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -156,7 +156,7 @@ qt_feature("linux_netlink" PRIVATE LABEL "Linux AF_NETLINK" CONDITION LINUX AND TEST_linux_netlink ) -qt_feature("openssl" PUBLIC PRIVATE +qt_feature("openssl" PRIVATE LABEL "OpenSSL" AUTODETECT NOT WINRT AND NOT WASM CONDITION NOT QT_FEATURE_securetransport AND ( QT_FEATURE_openssl_linked OR OPENSSL_INCLUDE_DIR ) @@ -164,14 +164,14 @@ qt_feature("openssl" PUBLIC PRIVATE DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' ) qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE) -qt_feature("openssl_linked" PUBLIC PRIVATE +qt_feature("openssl_linked" PRIVATE LABEL " Qt directly linked to OpenSSL" CONDITION NOT QT_FEATURE_securetransport AND OpenSSL_FOUND ENABLE INPUT_openssl STREQUAL 'linked' DISABLE ( NOT INPUT_openssl STREQUAL 'linked' ) ) qt_feature_definition("openssl_linked" "QT_LINKED_OPENSSL") -qt_feature("securetransport" PUBLIC PRIVATE +qt_feature("securetransport" PRIVATE LABEL "SecureTransport" CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no' |