[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.165 1.166

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
add support for finding qcollectiongenerator executable.  fixes #9248.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.165
retrieving revision 1.166
diff -C 2 -d -r1.165 -r1.166
*** FindQt4.cmake	22 Sep 2009 20:28:13 -0000	1.165
--- FindQt4.cmake	22 Sep 2009 22:44:24 -0000	1.166
***************
*** 248,259 ****
  #  
  # also defined, but NOT for general use are
! #  QT_MOC_EXECUTABLE          Where to find the moc tool.
! #  QT_UIC_EXECUTABLE          Where to find the uic tool.
! #  QT_UIC3_EXECUTABLE         Where to find the uic3 tool.
! #  QT_RCC_EXECUTABLE          Where to find the rcc tool
! #  QT_DBUSCPP2XML_EXECUTABLE  Where to find the qdbuscpp2xml tool.
! #  QT_DBUSXML2CPP_EXECUTABLE  Where to find the qdbusxml2cpp tool.
! #  QT_LUPDATE_EXECUTABLE      Where to find the lupdate tool.
! #  QT_LRELEASE_EXECUTABLE     Where to find the lrelease tool.
  #  
  #
--- 248,260 ----
  #  
  # also defined, but NOT for general use are
! #  QT_MOC_EXECUTABLE                   Where to find the moc tool.
! #  QT_UIC_EXECUTABLE                   Where to find the uic tool.
! #  QT_UIC3_EXECUTABLE                  Where to find the uic3 tool.
! #  QT_RCC_EXECUTABLE                   Where to find the rcc tool
! #  QT_DBUSCPP2XML_EXECUTABLE           Where to find the qdbuscpp2xml tool.
! #  QT_DBUSXML2CPP_EXECUTABLE           Where to find the qdbusxml2cpp tool.
! #  QT_LUPDATE_EXECUTABLE               Where to find the lupdate tool.
! #  QT_LRELEASE_EXECUTABLE              Where to find the lrelease tool.
! #  QT_QCOLLECTIONGENERATOR_EXECUTABLE  Where to find the qcollectiongenerator tool.
  #  
  #
***************
*** 881,884 ****
--- 882,886 ----
      SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
      SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
+     SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
    ENDIF(QT_QMAKE_CHANGED)
    
***************
*** 931,934 ****
--- 933,942 ----
      )
  
+   FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+     NAMES qcollectiongenerator-qt4 qcollectiongenerator
+     PATHS ${QT_BINARY_DIR}
+     NO_DEFAULT_PATH
+     )
+ 
    IF (QT_MOC_EXECUTABLE)
       SET(QT_WRAP_CPP "YES")
***************
*** 943,947 ****
    MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
      QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
!     QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE)
  
    ######################################
--- 951,955 ----
    MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
      QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
!     QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE)
  
    ######################################