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

also provide QT_DESIGNER_EXECUTABLE and QT_LINGUIST_EXECUTABLE 

Alex
This commit is contained in:
Alexander Neundorf 2009-11-23 17:53:50 -05:00
parent b3023d2587
commit 1d9cb15513
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindQt4.cmake
View File

@ -270,6 +270,8 @@
# 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. # QT_QCOLLECTIONGENERATOR_EXECUTABLE Where to find the qcollectiongenerator tool.
# QT_DESIGNER_EXECUTABLE Where to find the Qt designer tool.
# QT_LINGUIST_EXECUTABLE Where to find the Qt linguist tool.
# #
# #
# These are around for backwards compatibility # These are around for backwards compatibility
@ -924,6 +926,8 @@ IF (QT4_QMAKE_FOUND)
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) SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
SET(QT_DESIGNER_EXECUTABLE NOTFOUND)
SET(QT_LINGUIST_EXECUTABLE NOTFOUND)
ENDIF(QT_QMAKE_CHANGED) ENDIF(QT_QMAKE_CHANGED)
FIND_PROGRAM(QT_MOC_EXECUTABLE FIND_PROGRAM(QT_MOC_EXECUTABLE
@ -980,6 +984,18 @@ IF (QT4_QMAKE_FOUND)
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
NAMES designer-qt4 designer
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
NAMES linguist-qt4 linguist
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)
@ -992,7 +1008,8 @@ 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_QCOLLECTIONGENERATOR_EXECUTABLE) QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_QCOLLECTIONGENERATOR_EXECUTABLE
QT_DESIGNER_EXECUTABLE QT_LINGUIST_EXECUTABLE)
# get the directory of the current file, used later on in the file # get the directory of the current file, used later on in the file