diff options
| -rw-r--r-- | Modules/FindQt4.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index b0cff27..f6ab115 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1157,7 +1157,15 @@ IF (QT4_QMAKE_FOUND) SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) ENDIF(QT_QCONFIG MATCHES "system-zlib") - + ## glib + IF(QT_QCONFIG MATCHES "glib") + # Qt less than Qt 4.2.0 doesn't use glib + # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that) + FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) + SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_GLIB_LIBRARY}) + MARK_AS_ADVANCED(QT_GLIB_LIBRARY) + ENDIF(QT_QCONFIG MATCHES "glib") + IF(Q_WS_X11) # X11 libraries Qt absolutely depends on QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11") |