diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-03-14 17:29:16 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-03-14 17:29:16 (GMT) |
| commit | f874cd684c5212405fdf3e88f50a9da0c8a11a29 (patch) | |
| tree | 424ee4001f11245bd4d611ee2af071ea78b8fbee | |
| parent | 58a2872f2eec36ff85a4c9f16b79b7b8a69a5424 (diff) | |
| download | CMake-f874cd684c5212405fdf3e88f50a9da0c8a11a29.zip CMake-f874cd684c5212405fdf3e88f50a9da0c8a11a29.tar.gz CMake-f874cd684c5212405fdf3e88f50a9da0c8a11a29.tar.bz2 | |
ENH: Satisfy QtNetwork and QtOpenGL dependencies for builds with static Qt.
Partial fix for #6607.
| -rw-r--r-- | Modules/FindQt4.cmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 7157259..97402a0 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1269,6 +1269,8 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTGUI_LIB_DEPENDENCIES "") SET(QT_QTCORE_LIB_DEPENDENCIES "") + SET(QT_QTNETWORK_LIB_DEPENDENCIES "") + SET(QT_QTOPENGL_LIB_DEPENDENCIES "") SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY}) # build using shared Qt needs -DQT_DLL @@ -1278,6 +1280,10 @@ IF (QT4_QMAKE_FOUND) SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL) ENDIF(NOT QT_CONFIG MATCHES "static") + # QtOpenGL dependencies + QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL") + SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL}) + ## system png IF(QT_QCONFIG MATCHES "system-png") FIND_LIBRARY(QT_PNG_LIBRARY NAMES png) @@ -1362,6 +1368,12 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) ENDIF(QT_QCONFIG MATCHES "system-zlib") + + ## openssl + IF(QT_QCONFIG MATCHES "openssl") + FIND_PACKAGE(OpenSSL) + SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES}) + ENDIF(QT_QCONFIG MATCHES "openssl") ## glib IF(QT_QCONFIG MATCHES "glib") @@ -1405,7 +1417,7 @@ IF (QT4_QMAKE_FOUND) MARK_AS_ADVANCED(QT_RT_LIBRARY) ENDIF(QT_POSIX_TIMERS) ENDIF(QT_QCONFIG MATCHES "clock-monotonic") - + IF(Q_WS_X11) # X11 libraries Qt absolutely depends on QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11") |