[cmake-commits] hoffman committed FindQt4.cmake 1.68 1.69

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19553

Modified Files:
	FindQt4.cmake 
Log Message:
BUG: fix for bug # 3954 glib with qt


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- FindQt4.cmake	20 Feb 2007 20:15:55 -0000	1.68
+++ FindQt4.cmake	20 Feb 2007 21:35:45 -0000	1.69
@@ -1157,7 +1157,15 @@
     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")