[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.134 1.135

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Fix #7784.  Fix link of glib when needed.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.134
retrieving revision 1.135
diff -C 2 -d -r1.134 -r1.135
*** FindQt4.cmake	22 Sep 2008 19:00:31 -0000	1.134
--- FindQt4.cmake	7 Oct 2008 14:35:22 -0000	1.135
***************
*** 1587,1599 ****
        FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
        FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
! 
!       IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
!         SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
!             ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
!       ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
! 
        MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
        MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
      ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
    ENDIF(QT_QCONFIG MATCHES "glib")
    
--- 1587,1600 ----
        FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
        FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
!     
        MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
        MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
      ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
+ 
+     IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
+       SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
+           ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
+     ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
+ 
    ENDIF(QT_QCONFIG MATCHES "glib")