diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2009-10-07 22:51:39 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2009-10-07 22:51:39 (GMT) |
| commit | cff3a4420bde5e259b06bc76beaf6e70aaa8e6e5 (patch) | |
| tree | f7fbbbaa8516c04b9b4b831809f2266ef8889cc3 /Modules | |
| parent | 7dcfc8d23a3624504b344fdc4e7fe4080d853b23 (diff) | |
| download | CMake-cff3a4420bde5e259b06bc76beaf6e70aaa8e6e5.zip CMake-cff3a4420bde5e259b06bc76beaf6e70aaa8e6e5.tar.gz CMake-cff3a4420bde5e259b06bc76beaf6e70aaa8e6e5.tar.bz2 | |
Check for openssl-linked option with Qt 4.4+ before making ssl a dependency.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 66f6805..0688e53 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -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") |