diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2019-08-08 09:00:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-12 16:23:57 +0100 |
commit | a3845f921a5e7ee46502ee30c2cb8608d5e792e8 (patch) | |
tree | 796f964f972dc417536b8f73e047dc3183cfeb79 /meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch | |
parent | 93f44ffc86f441b58262c8828962c900e3ecf97e (diff) | |
download | poky-a3845f921a5e7ee46502ee30c2cb8608d5e792e8.tar.gz |
cmake: 3.14.5 -> 3.15.1
The patches were refreshed with devtool.
I rebuilt all cmake recipes from poky and meta-oe without issue.
(From OE-Core rev: 022d642b0c8f464b451c543db50bb93012bce607)
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 11 |
1 files changed, 4 insertions, 7 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 index 4f2e84337e..d7d87a5256 100644 --- 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 | |||
@@ -1,8 +1,7 @@ | |||
1 | From c783ceeef485c23e13c3d9f0418719cb0e0b86ee Mon Sep 17 00:00:00 2001 | 1 | From b003857d3481105c473e2e75bad4e9e2c6e70004 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Thu, 12 May 2011 15:36:03 +0000 | 3 | Date: Thu, 12 May 2011 15:36:03 +0000 |
4 | Subject: [PATCH 3/5] cmake: support OpenEmbedded Qt4 tool binary names | 4 | Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names |
5 | Organization: O.S. Systems Software LTDA. | ||
6 | 5 | ||
7 | 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 |
8 | 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 |
@@ -20,12 +19,13 @@ Instead of find_program, _find_qt4_program is now used. | |||
20 | 19 | ||
21 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | 20 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
22 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 21 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
22 | |||
23 | --- | 23 | --- |
24 | Modules/FindQt4.cmake | 10 +++++----- | 24 | Modules/FindQt4.cmake | 10 +++++----- |
25 | 1 file changed, 5 insertions(+), 5 deletions(-) | 25 | 1 file changed, 5 insertions(+), 5 deletions(-) |
26 | 26 | ||
27 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 27 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
28 | index 847a798af..7ad981879 100644 | 28 | index a145b46..7e18243 100644 |
29 | --- a/Modules/FindQt4.cmake | 29 | --- a/Modules/FindQt4.cmake |
30 | +++ b/Modules/FindQt4.cmake | 30 | +++ b/Modules/FindQt4.cmake |
31 | @@ -518,7 +518,7 @@ endfunction() | 31 | @@ -518,7 +518,7 @@ endfunction() |
@@ -54,6 +54,3 @@ index 847a798af..7ad981879 100644 | |||
54 | _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) | 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) | 55 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) |
56 | 56 | ||
57 | -- | ||
58 | 2.18.0 | ||
59 | |||