diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2018-01-17 13:59:33 -0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:18:04 +0000 |
| commit | 9e58926f1cea9d5cb18cb923855d1ae98f88a8ac (patch) | |
| tree | 6f53cf29a37efc697cdc99bc12fa81caf522af06 /meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |
| parent | b77bb7afe5131d9157be9dfebda4d4185a98a820 (diff) | |
| download | openembedded-core-9e58926f1cea9d5cb18cb923855d1ae98f88a8ac.tar.gz | |
cmake: upgrade 3.9.5 -> 3.10.1
The 3.10.1 version has been in Dec 13, 2017, and has a great set of
features and improvements since the last upgrade.
The release notes of 3.10 release is available at:
https://cmake.org/cmake/help/v3.10/release/3.10.html
Patches updates:
- cmake-Prevent-the-detection-of-Qt5.patch: so it replaces the sed
command calls inside the cmake.inc
- 0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch:
merged upstream, so it has been removed.
- support-oe-qt4-tools-names.patch: rebased.
License-checksum-change: added new contributors
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ -cmake: support OpenEmbedded Qt4 tool binary names +From 10b8b523869124d2fc8cd98d9e028c0bcffd61b1 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Thu, 12 May 2011 15:36:03 +0000 +Subject: [PATCH 1/2] 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 @@ -15,15 +18,16 @@ The patch was slightly adapted in order to match cmake 3.2.2: Instead of find_program, _find_qt4_program is now used. Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> + --- Modules/FindQt4.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake -index 11091b5..6704769 100644 +index c67d0be..0cf169b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake -@@ -522,7 +522,7 @@ endfunction() +@@ -516,7 +516,7 @@ endfunction() set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) @@ -32,7 +36,7 @@ index 11091b5..6704769 100644 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) if (QT_QMAKE_EXECUTABLE AND -@@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND +@@ -1142,12 +1142,12 @@ if (QT_QMAKE_EXECUTABLE AND _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) @@ -50,5 +54,5 @@ index 11091b5..6704769 100644 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) -- -1.9.1 +2.7.4 |