[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.163 1.164

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
Fix issue 9581.  Qt 4.5+ needs gobject-2.0.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.163
retrieving revision 1.164
diff -C 2 -d -r1.163 -r1.164
*** FindQt4.cmake	1 Sep 2009 19:21:06 -0000	1.163
--- FindQt4.cmake	22 Sep 2009 03:07:44 -0000	1.164
***************
*** 1545,1548 ****
--- 1545,1575 ----
      ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
  
+ 
+     # Qt 4.5+ also links to gobject-2.0
+     IF(QT_VERSION_MINOR GREATER 4)
+        IF(NOT QT_GOBJECT_LIBRARY)
+          EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L gobject-2.0
+            OUTPUT_VARIABLE _glib_query_output
+            RESULT_VARIABLE _glib_result
+            ERROR_VARIABLE _glib_query_output )
+ 
+          IF(_glib_result MATCHES 0)
+            STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
+            SEPARATE_ARGUMENTS(_glib_query_output)
+          ELSE(_glib_result MATCHES 0)
+            SET(_glib_query_output)
+          ENDIF(_glib_result MATCHES 0)
+ 
+          FIND_LIBRARY(QT_GOBJECT_LIBRARY NAMES gobject-2.0 PATHS ${_glib_query_output} )
+        
+          MARK_AS_ADVANCED(QT_GOBJECT_LIBRARY)
+        ENDIF(NOT QT_GOBJECT_LIBRARY)
+ 
+        IF(QT_GOBJECT_LIBRARY)
+          SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
+              ${QT_GOBJECT_LIBRARY})
+        ENDIF(QT_GOBJECT_LIBRARY)
+     ENDIF(QT_VERSION_MINOR GREATER 4)
+ 
    ENDIF(QT_QCONFIG MATCHES "glib")