[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.180 1.181
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 23 17:53:52 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12448
Modified Files:
FindQt4.cmake
Log Message:
also provide QT_DESIGNER_EXECUTABLE and QT_LINGUIST_EXECUTABLE
Alex
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.180
retrieving revision 1.181
diff -C 2 -d -r1.180 -r1.181
*** FindQt4.cmake 17 Nov 2009 19:44:33 -0000 1.180
--- FindQt4.cmake 23 Nov 2009 22:53:50 -0000 1.181
***************
*** 271,274 ****
--- 271,276 ----
# QT_LRELEASE_EXECUTABLE Where to find the lrelease 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.
#
#
***************
*** 925,928 ****
--- 927,932 ----
SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
SET(QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
+ SET(QT_DESIGNER_EXECUTABLE NOTFOUND)
+ SET(QT_LINGUIST_EXECUTABLE NOTFOUND)
ENDIF(QT_QMAKE_CHANGED)
***************
*** 981,984 ****
--- 985,1000 ----
)
+ 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)
SET(QT_WRAP_CPP "YES")
***************
*** 993,997 ****
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)
--- 1009,1014 ----
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
! QT_DESIGNER_EXECUTABLE QT_LINGUIST_EXECUTABLE)
More information about the Cmake-commits
mailing list