[Cmake-commits] [cmake-commits] clinton committed UseQt4.cmake 1.16 1.17

[cmake-commits at cmake.org]

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

Modified Files:
	UseQt4.cmake 
Log Message:

BUG:  Fix #7934.  phonon doesn't always depend on QtDBus.



Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** UseQt4.cmake	19 May 2008 22:07:00 -0000	1.16
--- UseQt4.cmake	5 Nov 2008 21:54:26 -0000	1.17
***************
*** 42,46 ****
  SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
  SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
! SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
--- 42,50 ----
  SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
  SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
! IF(QT_QTDBUS_FOUND)
!   SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
! ELSE(QT_QTDBUS_FOUND)
!   SET(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
! ENDIF(QT_QTDBUS_FOUND)
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)