diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /src/network/configure.cmake | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
Regenerate files after dev -> wip/cmake merge
Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).
Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/network/configure.cmake')
| -rw-r--r-- | src/network/configure.cmake | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 2dd5460b9d..1e2df486f4 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -9,6 +9,7 @@ qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy) qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL) qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL) +qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI) #### Tests @@ -165,23 +166,6 @@ int main(int argc, char **argv) "# FIXME: use: openssl ) -# gssapi -qt_config_compile_test(gssapi - LABEL "KRB5 GSSAPI support" -" -#include <gssapi/gssapi.h> - -int main(int argc, char **argv) -{ - (void)argc; (void)argv; - /* BEGIN TEST: */ -gss_ctx_id_t ctx; - /* END TEST: */ - return 0; -} -"# FIXME: qmake: LIBS += -lgssapi_krb5 -) - # netlistmgr qt_config_compile_test(netlistmgr LABEL "Network List Manager" @@ -349,6 +333,7 @@ qt_feature("bearermanagement" PUBLIC CONDITION QT_FEATURE_thread AND QT_FEATURE_library AND QT_FEATURE_networkinterface AND QT_FEATURE_properties ) qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE VALUE "1") +qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE) qt_feature("localserver" PUBLIC SECTION "Networking" LABEL "QLocalServer" @@ -365,7 +350,7 @@ qt_feature("gssapi" PUBLIC SECTION "Networking" LABEL "GSSAPI" PURPOSE "Enable SPNEGO authentication through GSSAPI" - CONDITION NOT WIN32 AND TEST_gssapi + CONDITION NOT WIN32 AND GSSAPI_FOUND ) qt_feature_definition("gssapi" "QT_NO_GSSAPI" NEGATE VALUE "1") qt_feature("sspi" PUBLIC |