|
|
@@ -1519,12 +1519,21 @@ IF (QT4_QMAKE_FOUND)
|
|
|
ENDIF(QT_QCONFIG MATCHES "system-zlib")
|
|
|
|
|
|
## openssl
|
|
|
- IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
|
|
- FIND_PACKAGE(OpenSSL)
|
|
|
- IF(OPENSSL_LIBRARIES)
|
|
|
- SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
|
|
|
- ENDIF(OPENSSL_LIBRARIES)
|
|
|
- ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
|
|
+ IF(NOT Q_WS_WIN)
|
|
|
+ SET(_QT_NEED_OPENSSL 0)
|
|
|
+ IF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
|
|
|
+ SET(_QT_NEED_OPENSSL 1)
|
|
|
+ ENDIF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
|
|
|
+ IF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
|
|
|
+ SET(_QT_NEED_OPENSSL 1)
|
|
|
+ ENDIF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
|
|
|
+ IF(_QT_NEED_OPENSSL)
|
|
|
+ FIND_PACKAGE(OpenSSL)
|
|
|
+ IF(OPENSSL_LIBRARIES)
|
|
|
+ SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
|
|
|
+ ENDIF(OPENSSL_LIBRARIES)
|
|
|
+ ENDIF(_QT_NEED_OPENSSL)
|
|
|
+ ENDIF(NOT Q_WS_WIN)
|
|
|
|
|
|
## dbus
|
|
|
IF(QT_QCONFIG MATCHES "dbus")
|