diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/network/CMakeLists.txt | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/network/CMakeLists.txt')
-rw-r--r-- | src/network/CMakeLists.txt | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 180afb7cc5..02d31fc468 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,3 +1,5 @@ +# Generated from network.pro. + ##################################################################### ## Network Module: ##################################################################### @@ -146,6 +148,8 @@ extend_target(Network CONDITION UNIX kernel/qhostinfo_unix.cpp socket/qnativesocketengine_unix.cpp socket/qnet_unix_p.h + LIBRARIES + ${CMAKE_DL_LIBS} ) # special case: Do not add this to android! @@ -208,6 +212,11 @@ extend_target(Network CONDITION APPLE_OSX AND NOT APPLE_UIKIT ${FWSystemConfiguration} ) +extend_target(Network CONDITION QT_FEATURE_gssapi + LIBRARIES + gssapi_krb5 +) + extend_target(Network CONDITION APPLE_UIKIT SOURCES kernel/qnetworkinterface_uikit_p.h @@ -285,6 +294,7 @@ extend_target(Network CONDITION NOT QT_FEATURE_openssl extend_target(Network CONDITION QT_FEATURE_ssl SOURCES + ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h @@ -305,6 +315,22 @@ extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h ) +extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl + SOURCES + ssl/qsslcertificate_schannel.cpp + ssl/qssldiffiehellmanparameters_dummy.cpp + ssl/qsslellipticcurve_dummy.cpp + ssl/qsslkey_qt.cpp + ssl/qsslkey_schannel.cpp + ssl/qsslsocket_qt.cpp + ssl/qsslsocket_schannel.cpp ssl/qsslsocket_schannel_p.h + LIBRARIES + Crypt32 + Secur32 + bcrypt + ncrypt +) + extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl SOURCES ssl/qssldiffiehellmanparameters_dummy.cpp @@ -337,6 +363,11 @@ extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FE ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h ) +extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl + SOURCES + ssl/qocsp_p.h +) + extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl SOURCES ssl/qsslcontext_openssl11.cpp @@ -383,5 +414,5 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32 extend_target(Network CONDITION WIN32 LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf add_qt_docs( - ./doc/qtnetwork.qdocconf + doc/qtnetwork.qdocconf ) |