diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch index 15cbca89d8..6841554763 100644 --- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | cmake: support OpenEmbedded Qt4 tool binary names | 1 | From 10b8b523869124d2fc8cd98d9e028c0bcffd61b1 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 1/2] cmake: support OpenEmbedded Qt4 tool binary names | ||
2 | 5 | ||
3 | The FindQt4 module looks for Qt4 binaries to be able to gather the | 6 | 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 | 7 | paths used for compilation and also to be using during other processes |
@@ -15,15 +18,16 @@ The patch was slightly adapted in order to match cmake 3.2.2: | |||
15 | Instead of find_program, _find_qt4_program is now used. | 18 | Instead of find_program, _find_qt4_program is now used. |
16 | 19 | ||
17 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | 20 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
21 | |||
18 | --- | 22 | --- |
19 | Modules/FindQt4.cmake | 10 +++++----- | 23 | Modules/FindQt4.cmake | 10 +++++----- |
20 | 1 file changed, 5 insertions(+), 5 deletions(-) | 24 | 1 file changed, 5 insertions(+), 5 deletions(-) |
21 | 25 | ||
22 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 26 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
23 | index 11091b5..6704769 100644 | 27 | index c67d0be..0cf169b 100644 |
24 | --- a/Modules/FindQt4.cmake | 28 | --- a/Modules/FindQt4.cmake |
25 | +++ b/Modules/FindQt4.cmake | 29 | +++ b/Modules/FindQt4.cmake |
26 | @@ -522,7 +522,7 @@ endfunction() | 30 | @@ -516,7 +516,7 @@ endfunction() |
27 | 31 | ||
28 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | 32 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) |
29 | 33 | ||
@@ -32,7 +36,7 @@ index 11091b5..6704769 100644 | |||
32 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | 36 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) |
33 | 37 | ||
34 | if (QT_QMAKE_EXECUTABLE AND | 38 | if (QT_QMAKE_EXECUTABLE AND |
35 | @@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND | 39 | @@ -1142,12 +1142,12 @@ if (QT_QMAKE_EXECUTABLE AND |
36 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) | 40 | _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) | 41 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) |
38 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) | 42 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) |
@@ -50,5 +54,5 @@ index 11091b5..6704769 100644 | |||
50 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) | 54 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) |
51 | 55 | ||
52 | -- | 56 | -- |
53 | 1.9.1 | 57 | 2.7.4 |
54 | 58 | ||