99 lines
2.8 KiB
Diff
99 lines
2.8 KiB
Diff
cmake: support OpenEmbedded Qt4 tool binary names
|
|
|
|
The FindQt4 module looks for Qt4 binaries to be able to gather the
|
|
paths used for compilation and also to be using during other processes
|
|
(translation update, translation binary generating and like) however
|
|
OpenEmbedded has renamed those to allow old QMake to be used in
|
|
parallel with the current one. This patch adds support for the
|
|
OpenEmbedded specific binary names.
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
|
|
--- a/Modules/FindQt4.cmake
|
|
+++ b/Modules/FindQt4.cmake
|
|
@@ -461,7 +461,7 @@
|
|
# check for qmake
|
|
# Debian uses qmake-qt4
|
|
# macports' Qt uses qmake-mac
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
|
|
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac PATHS
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
@@ -988,13 +988,13 @@
|
|
ENDIF(QT_QMAKE_CHANGED)
|
|
|
|
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
|
- NAMES moc-qt4 moc
|
|
+ NAMES moc-qt4 moc4 moc
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_UIC_EXECUTABLE
|
|
- NAMES uic-qt4 uic
|
|
+ NAMES uic-qt4 uic4 uic
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
@@ -1006,49 +1006,49 @@
|
|
)
|
|
|
|
FIND_PROGRAM(QT_RCC_EXECUTABLE
|
|
- NAMES rcc
|
|
+ NAMES rcc4 rcc
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
|
|
- NAMES qdbuscpp2xml
|
|
+ NAMES qdbuscpp2xml4 qdbuscpp2xml
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
|
|
- NAMES qdbusxml2cpp
|
|
+ NAMES qdbusxml2cpp4 qdbusxml2cpp
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
|
|
- NAMES lupdate-qt4 lupdate
|
|
+ NAMES lupdate-qt4 lupdate4 lupdate
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
|
|
- NAMES lrelease-qt4 lrelease
|
|
+ NAMES lrelease-qt4 lrelease4 lrelease
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
|
|
- NAMES qcollectiongenerator-qt4 qcollectiongenerator
|
|
+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
|
|
- NAMES designer-qt4 designer
|
|
+ NAMES designer-qt4 designer4 designer
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
|
|
- NAMES linguist-qt4 linguist
|
|
+ NAMES linguist-qt4 linguist4 linguist
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|