From ebaceac469f19c51da390c7028d28e17ef991df4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 28 Aug 2018 12:51:09 +0200 Subject: PySide2: Replace macro check_qt_class by the Qt configure system Query the feature properties of the configure system to check whether a class is present instead of running a compile test in QtGui and QtNetwork. Remove the macro invocation from QtWigets since the results (QtWidgets_OPTIONAL_SRC, QtWidgets_DROPPED_ENTRIES) were not used. Change-Id: I06e03fe1eef85f2340ab4cdb130b8b31b08f7f14 Reviewed-by: Christian Tismer --- sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 66 +++++++++++++++++------- 1 file changed, 48 insertions(+), 18 deletions(-) (limited to 'sources/pyside2/PySide2/QtNetwork') diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 0ea57693b..a7c8dd8f6 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -1,24 +1,7 @@ project(QtNetwork) -set(QtNetwork_OPTIONAL_SRC ) set(QtNetwork_DROPPED_ENTRIES ) -check_qt_class(QtNetwork QDtls QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslCertificate QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslCertificateExtension QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslCipher QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslConfiguration QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslDiffieHellmanParameters QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -# Problems with operator==(QSslEllipticCurve,QSslEllipticCurve) -# check_qt_class(QtNetwork QSslEllipticCurve QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslError QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslKey QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslPreSharedKeyAuthenticator QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSslSocket QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) - -check_qt_class(QtNetwork QSctpServer QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) -check_qt_class(QtNetwork QSctpSocket QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) - set(QtNetwork_SRC ${QtNetwork_GEN_DIR}/qabstractnetworkcache_wrapper.cpp ${QtNetwork_GEN_DIR}/qabstractsocket_wrapper.cpp @@ -58,11 +41,58 @@ ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpserver_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qudpsocket_wrapper.cpp -${QtNetwork_OPTIONAL_SRC} # module is always needed ${QtNetwork_GEN_DIR}/qtnetwork_module_wrapper.cpp ) +get_property(QtNetwork_enabled_features TARGET Qt5::Network PROPERTY INTERFACE_QT_ENABLED_FEATURES) +get_property(QtNetwork_disabled_features TARGET Qt5::Network PROPERTY INTERFACE_QT_DISABLED_FEATURES) + +# ### fixme: For cmake >= 3.3, use if( needle IN_LIST list) +list(FIND QtNetwork_enabled_features "ssl" _sslEnabledIndex) +list(FIND QtNetwork_disabled_features "dtls" _dtlsDisabledIndex) +list(FIND QtNetwork_disabled_features "sctp" _sctpDisabledIndex) + +if(_sslEnabledIndex EQUAL -1) + list(APPEND QtNetwork_DROPPED_ENTRIES QSslCertificate QSslCertificateExtension + QSslCipher QSslConfiguration QSslDiffieHellmanParameters QSslError + QSslKey QSslPreSharedKeyAuthenticator QSslSocket) + message(STATUS "Qt5Network: Dropping SSL classes") +else() + # Problems with operator==(QSslEllipticCurve,QSslEllipticCurve) + # check_qt_class(QtNetwork QSslEllipticCurve QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) + list(APPEND QtNetwork_SRC + ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslcertificateextension_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslcipher_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslconfiguration_wrapper.cpp + ${QtNetwork_GEN_DIR}/qssldiffiehellmanparameters_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslerror_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslkey_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslpresharedkeyauthenticator_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsslsocket_wrapper.cpp) + message(STATUS "Qt5Network: Adding SSL classes") +endif() + +if(_dtlsDisabledIndex GREATER -1) + list(APPEND QtNetwork_DROPPED_ENTRIES QDtls) + message(STATUS "Qt5Network: Dropping DTLS classes") +else() + list(APPEND QtNetwork_SRC + ${QtNetwork_GEN_DIR}/qdtls_wrapper.cpp) + message(STATUS "Qt5Network: Adding DTLS classes") +endif() + +if(_sctpDisabledIndex GREATER -1) + list(APPEND QtNetwork_DROPPED_ENTRIES QSctpServer QSctpSocket) + message(STATUS "Qt5Network: Dropping SCTP classes") +else() + list(APPEND QtNetwork_SRC + ${QtNetwork_GEN_DIR}/qsctpserver_wrapper.cpp + ${QtNetwork_GEN_DIR}/qsctpsocket_wrapper.cpp) + message(STATUS "Qt5Network: Adding SCTP classes") +endif() + set(QtNetwork_include_dirs ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} -- cgit v1.2.3