diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch new file mode 100644 index 0000000000..55cf47188a --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From c783ceeef485c23e13c3d9f0418719cb0e0b86ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Thu, 12 May 2011 15:36:03 +0000 | ||
4 | Subject: [PATCH 3/5] cmake: support OpenEmbedded Qt4 tool binary names | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | The FindQt4 module looks for Qt4 binaries to be able to gather the | ||
8 | paths used for compilation and also to be using during other processes | ||
9 | (translation update, translation binary generating and like) however | ||
10 | OpenEmbedded has renamed those to allow old QMake to be used in | ||
11 | parallel with the current one. This patch adds support for the | ||
12 | OpenEmbedded specific binary names. | ||
13 | |||
14 | Upstream-Status: Inappropriate [embedded specific] | ||
15 | |||
16 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
17 | |||
18 | The patch was slightly adapted in order to match cmake 3.2.2: | ||
19 | Instead of find_program, _find_qt4_program is now used. | ||
20 | |||
21 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | ||
22 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
23 | --- | ||
24 | Modules/FindQt4.cmake | 10 +++++----- | ||
25 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
26 | |||
27 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | ||
28 | index 847a798af..7ad981879 100644 | ||
29 | --- a/Modules/FindQt4.cmake | ||
30 | +++ b/Modules/FindQt4.cmake | ||
31 | @@ -517,7 +517,7 @@ endfunction() | ||
32 | |||
33 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | ||
34 | |||
35 | -set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) | ||
36 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) | ||
37 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | ||
38 | |||
39 | if (QT_QMAKE_EXECUTABLE AND | ||
40 | @@ -1135,12 +1135,12 @@ if (QT_QMAKE_EXECUTABLE AND | ||
41 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) | ||
42 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) | ||
43 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) | ||
44 | - _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc) | ||
45 | - _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml) | ||
46 | - _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp) | ||
47 | + _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc) | ||
48 | + _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml) | ||
49 | + _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp) | ||
50 | _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate) | ||
51 | _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease) | ||
52 | - _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator) | ||
53 | + _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4) | ||
54 | _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) | ||
55 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) | ||
56 | |||
57 | -- | ||
58 | 2.18.0 | ||
59 | |||