kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check for openssl-linked option with Qt 4.4+ before making ssl a dependency.

This commit is contained in:
Clinton Stimpson 2009-10-07 18:51:39 -04:00
parent 7dcfc8d23a
commit cff3a4420b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/FindQt4.cmake
View File

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