[cmake-commits] hoffman committed FindQt4.cmake 1.25.2.12 1.25.2.13

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	FindQt4.cmake 
Log Message:
ENH: last change for 2.4.8 branch, I hope, fix for findqt


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.25.2.12
retrieving revision 1.25.2.13
diff -u -d -r1.25.2.12 -r1.25.2.13
--- FindQt4.cmake	17 Dec 2007 22:40:57 -0000	1.25.2.12
+++ FindQt4.cmake	8 Jan 2008 16:06:42 -0000	1.25.2.13
@@ -1230,8 +1230,10 @@
     # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that it uses 2.0)
     FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0)
     FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0)
-    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES}
+    IF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY)  #TEMP: need more robust find of glib2
+      SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES}
         ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
+    ENDIF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY)
     MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
     MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
   ENDIF(QT_QCONFIG MATCHES "glib")