diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-20 21:35:45 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-20 21:35:45 (GMT) |
| commit | 533bd43d0f895dd1463dd7bfeb1d97abcfe45339 (patch) | |
| tree | 9fb45eb4b6a05830447dc4b2c54587d2fc63fe1f | |
| parent | 2fb0e4ba20ff136cf7944da884c70b513c99670a (diff) | |
| download | CMake-533bd43d0f895dd1463dd7bfeb1d97abcfe45339.zip CMake-533bd43d0f895dd1463dd7bfeb1d97abcfe45339.tar.gz CMake-533bd43d0f895dd1463dd7bfeb1d97abcfe45339.tar.bz2 | |
BUG: fix for bug # 3954 glib with qt
| -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") |