kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add support for finding qcollectiongenerator executable. fixes #9248.

This commit is contained in:
Clinton Stimpson 2009-09-22 18:44:24 -04:00
parent ecfca5d0a8
commit 36606b6d73
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/FindQt4.cmake
View File

@ -247,14 +247,15 @@
# QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library # QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library
# #
# also defined, but NOT for general use are # also defined, but NOT for general use are
# QT_MOC_EXECUTABLE Where to find the moc tool. # QT_MOC_EXECUTABLE Where to find the moc tool.
# QT_UIC_EXECUTABLE Where to find the uic tool. # QT_UIC_EXECUTABLE Where to find the uic tool.
# QT_UIC3_EXECUTABLE Where to find the uic3 tool. # QT_UIC3_EXECUTABLE Where to find the uic3 tool.
# QT_RCC_EXECUTABLE Where to find the rcc tool # QT_RCC_EXECUTABLE Where to find the rcc tool
# QT_DBUSCPP2XML_EXECUTABLE Where to find the qdbuscpp2xml tool. # QT_DBUSCPP2XML_EXECUTABLE Where to find the qdbuscpp2xml tool.
# QT_DBUSXML2CPP_EXECUTABLE Where to find the qdbusxml2cpp tool. # QT_DBUSXML2CPP_EXECUTABLE Where to find the qdbusxml2cpp tool.
# QT_LUPDATE_EXECUTABLE Where to find the lupdate tool. # QT_LUPDATE_EXECUTABLE Where to find the lupdate tool.
# QT_LRELEASE_EXECUTABLE Where to find the lrelease tool. # QT_LRELEASE_EXECUTABLE Where to find the lrelease tool.
# QT_QCOLLECTIONGENERATOR_EXECUTABLE Where to find the qcollectiongenerator tool.
# #
# #
# These are around for backwards compatibility # These are around for backwards compatibility
@ -880,6 +881,7 @@ IF (QT4_QMAKE_FOUND)
SET(QT_DBUSXML2CPP_EXECUTABLE NOTFOUND) SET(QT_DBUSXML2CPP_EXECUTABLE NOTFOUND)
SET(QT_LUPDATE_EXECUTABLE NOTFOUND) SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
SET(QT_LRELEASE_EXECUTABLE NOTFOUND) SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
ENDIF(QT_QMAKE_CHANGED) ENDIF(QT_QMAKE_CHANGED)
FIND_PROGRAM(QT_MOC_EXECUTABLE FIND_PROGRAM(QT_MOC_EXECUTABLE
@ -930,6 +932,12 @@ IF (QT4_QMAKE_FOUND)
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
NAMES qcollectiongenerator-qt4 qcollectiongenerator
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
IF (QT_MOC_EXECUTABLE) IF (QT_MOC_EXECUTABLE)
SET(QT_WRAP_CPP "YES") SET(QT_WRAP_CPP "YES")
ENDIF (QT_MOC_EXECUTABLE) ENDIF (QT_MOC_EXECUTABLE)
@ -942,7 +950,7 @@ IF (QT4_QMAKE_FOUND)
MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE) QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE)
###################################### ######################################
# #