[cmake-commits] alex committed FindQt4.cmake 1.58 1.59 UseQt4.cmake 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake UseQt4.cmake 
Log Message:
ENH: add QT_USE_QTDBUS as it exists for all other modules too

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- FindQt4.cmake	4 Jan 2007 21:35:47 -0000	1.58
+++ FindQt4.cmake	4 Jan 2007 21:50:18 -0000	1.59
@@ -22,6 +22,7 @@
 #                    QT_USE_QTSVG
 #                    QT_USE_QTTEST
 #                    QT_USE_QTUITOOLS
+#                    QT_USE_QTDBUS
 #
 # All the libraries required are stored in a variable called QT_LIBRARIES.  
 # Add this variable to your TARGET_LINK_LIBRARIES.

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- UseQt4.cmake	4 Oct 2006 18:00:41 -0000	1.9
+++ UseQt4.cmake	4 Jan 2007 21:50:18 -0000	1.10
@@ -21,8 +21,7 @@
   IF (QT_QT${module}_FOUND)
     ADD_DEFINITIONS(-DQT_${module}_LIB)
     INCLUDE_DIRECTORIES(${QT_QT${module}_INCLUDE_DIR})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT${module}_LIBRARY})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
+    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
   ELSE (QT_QT${module}_FOUND)
     MESSAGE("Qt ${module} library not found.")
   ENDIF (QT_QT${module}_FOUND)
@@ -84,6 +83,10 @@
   QT_MODULE_SETUP(NETWORK)
 ENDIF (QT_USE_QTNETWORK)
 
+IF (QT_USE_QTDBUS)
+  QT_MODULE_SETUP(DBUS)
+ENDIF (QT_USE_QTDBUS)
+
 IF (NOT QT_DONT_USE_QTCORE)
   QT_MODULE_SETUP(CORE)
 ENDIF (NOT QT_DONT_USE_QTCORE)