[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.157 1.158 UseQt4.cmake 1.20 1.21

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake UseQt4.cmake 
Log Message:

ENH:  Add support for QtScriptTools in Qt 4.5.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.157
retrieving revision 1.158
diff -C 2 -d -r1.157 -r1.158
*** FindQt4.cmake	26 Mar 2009 15:04:18 -0000	1.157
--- FindQt4.cmake	6 May 2009 13:42:00 -0000	1.158
***************
*** 160,163 ****
--- 160,164 ----
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
+ #  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
  #
  #
***************
*** 203,206 ****
--- 204,208 ----
  #  QT_QTXMLPATTERNS_INCLUDE_DIR  Path to "include/QtXmlPatterns"
  #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
+ #  QT_QTSCRIPTTOOLS_INCLUDE_DIR       Path to "include/QtScriptTools"
  #                            
  #  QT_BINARY_DIR               Path to "bin" of Qt4
***************
*** 242,245 ****
--- 244,248 ----
  #  QT_QTXMLPATTERNS_LIBRARY         The QtXmlPatterns library
  #  QT_PHONON_LIBRARY                The phonon library
+ #  QT_QTSCRIPTTOOLS_LIBRARY         The QtScriptTools library
  #  
  # also defined, but NOT for general use are
***************
*** 545,549 ****
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
                   QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
!                  QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
  
    IF(QT_QMAKE_CHANGED)
--- 548,552 ----
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
                   QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
!                  QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
  
    IF(QT_QMAKE_CHANGED)
***************
*** 833,836 ****
--- 836,840 ----
    _QT4_ADJUST_LIB_VARS(QTCLUCENE)
    _QT4_ADJUST_LIB_VARS(QTMOTIF)
+   _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)
  
    # platform dependent libraries

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** UseQt4.cmake	6 Feb 2009 04:01:38 -0000	1.20
--- UseQt4.cmake	6 May 2009 13:42:01 -0000	1.21
***************
*** 54,63 ****
  SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
  SET(QT_QAXSERVER_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 QTGUI QTTEST QTDBUS QTXML QTSQL QTXMLPATTERNS 
!                QTNETWORK QTCORE)
  
    IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
--- 54,64 ----
  SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
  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)
  
    IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)