| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | cmake: support OpenEmbedded Qt4 tool binary names |
| 2 | |
| 3 | The FindQt4 module looks for Qt4 binaries to be able to gather the |
| 4 | paths used for compilation and also to be using during other processes |
| 5 | (translation update, translation binary generating and like) however |
| 6 | OpenEmbedded has renamed those to allow old QMake to be used in |
| 7 | parallel with the current one. This patch adds support for the |
| 8 | OpenEmbedded specific binary names. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [embedded specific] |
| 11 | |
| 12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| 13 | |
| 14 | The patch was slightly adapted in order to match cmake 3.2.2: |
| 15 | Instead of find_program, _find_qt4_program is now used. |
| 16 | |
| 17 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
| 18 | --- |
| 19 | Modules/FindQt4.cmake | 10 +++++----- |
| 20 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 21 | |
| 22 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
| 23 | index 11091b5..6704769 100644 |
| 24 | --- a/Modules/FindQt4.cmake |
| 25 | +++ b/Modules/FindQt4.cmake |
| 26 | @@ -522,7 +522,7 @@ endfunction() |
| 27 | |
| 28 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) |
| 29 | |
| 30 | -set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) |
| 31 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) |
| 32 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) |
| 33 | |
| 34 | if (QT_QMAKE_EXECUTABLE AND |
| 35 | @@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND |
| 36 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) |
| 37 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) |
| 38 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) |
| 39 | - _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc) |
| 40 | - _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml) |
| 41 | - _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp) |
| 42 | + _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc) |
| 43 | + _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml) |
| 44 | + _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp) |
| 45 | _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate) |
| 46 | _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease) |
| 47 | - _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator) |
| 48 | + _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4) |
| 49 | _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) |
| 50 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) |
| 51 | |
| 52 | -- |
| 53 | 1.9.1 |
| 54 | |