[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.189 1.190 UseQt4.cmake 1.25 1.26

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake UseQt4.cmake 
Log Message:
Add support for QtDeclartive module.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.189
retrieving revision 1.190
diff -C 2 -d -r1.189 -r1.190
*** FindQt4.cmake	18 Jan 2010 21:23:21 -0000	1.189
--- FindQt4.cmake	18 Feb 2010 00:12:17 -0000	1.190
***************
*** 52,55 ****
--- 52,56 ----
  #                    QT_USE_PHONON
  #                    QT_USE_QTSCRIPTTOOLS
+ #                    QT_USE_QTDECLARATIVE
  #
  #  QT_USE_IMPORTED_TARGETS 
***************
*** 187,190 ****
--- 188,192 ----
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
+ #  QT_QTDECLARATIVE_FOUND   True if QtDeclarative was found.
  #
  #  QT_MAC_USE_COCOA    For Mac OS X, its whether Cocoa or Carbon is used.
***************
*** 235,239 ****
  #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
  #  QT_QTSCRIPTTOOLS_INCLUDE_DIR       Path to "include/QtScriptTools"
! #                            
  #  QT_BINARY_DIR               Path to "bin" of Qt4
  #  QT_LIBRARY_DIR              Path to "lib" of Qt4
--- 237,242 ----
  #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
  #  QT_QTSCRIPTTOOLS_INCLUDE_DIR       Path to "include/QtScriptTools"
! #  QT_QTDECLARATIVE_INCLUDE_DIR       Path to "include/QtDeclarative"
! #
  #  QT_BINARY_DIR               Path to "bin" of Qt4
  #  QT_LIBRARY_DIR              Path to "lib" of Qt4
***************
*** 277,280 ****
--- 280,285 ----
  #  QT_QTSCRIPTTOOLS_LIBRARY         The QtScriptTools library
  #  
+ # The QtDeclarative library:             QT_QTDECLARATIVE_LIBRARY
+ #
  # also defined, but NOT for general use are
  #  QT_MOC_EXECUTABLE                   Where to find the moc tool.
***************
*** 639,643 ****
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
                   QtHelp QtWebKit QtXmlPatterns phonon QtNetwork QtMultimedia
!                  QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
    
    IF(Q_WS_X11)
--- 644,649 ----
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
                   QtHelp QtWebKit QtXmlPatterns phonon QtNetwork QtMultimedia
!                  QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools
!                  QtDeclarative)
    
    IF(Q_WS_X11)
***************
*** 950,953 ****
--- 956,960 ----
    _QT4_ADJUST_LIB_VARS(QtCLucene)
    _QT4_ADJUST_LIB_VARS(QtDBus)
+   _QT4_ADJUST_LIB_VARS(QtDeclarative)
    _QT4_ADJUST_LIB_VARS(QtDesigner)
    _QT4_ADJUST_LIB_VARS(QtDesignerComponents)

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** UseQt4.cmake	16 Dec 2009 22:16:59 -0000	1.25
--- UseQt4.cmake	18 Feb 2010 00:12:18 -0000	1.26
***************
*** 64,71 ****
  SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
  SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
  
  # Qt modules  (in order of dependence)
  FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
!                QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP 
                 QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL 
                 QTXMLPATTERNS QTNETWORK QTCORE)
--- 64,73 ----
  SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
  SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
+ SET(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
+ SET(QT_QTDECLARATIVE_MODULE_DEPENDS QTWEBKIT QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTXML QTOPENGL QTGUI QTNETWORK QTCORE)
  
  # Qt modules  (in order of dependence)
  FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
!                QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP 
                 QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL 
                 QTXMLPATTERNS QTNETWORK QTCORE)