summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2019-03-27 11:02:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-29 08:28:53 +0000
commitc545daa7cb2f22501c3f1c5d34b51101f5260307 (patch)
tree01a34ea3931a110659e7f2a9a52ffdb1c9451db4 /meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
parentdb4731b9318b1d01bd425d7e812edd489cbcf7b7 (diff)
downloadpoky-c545daa7cb2f22501c3f1c5d34b51101f5260307.tar.gz
cmake: 3.13.4 -> 3.14.0
The copyright date changed in the license file, thus the hash change. CMake 3.14 fixes some issues with implicit include path that lead to errors with gcc not finding "stdlib.h" etc in include_next. (From OE-Core rev: ec2764aa4957b802ed2612dd7633aed5b941bfb0) 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.patch4
1 files changed, 2 insertions, 2 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 55cf47188a..4f2e84337e 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
@@ -28,7 +28,7 @@ diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
28index 847a798af..7ad981879 100644 28index 847a798af..7ad981879 100644
29--- a/Modules/FindQt4.cmake 29--- a/Modules/FindQt4.cmake
30+++ b/Modules/FindQt4.cmake 30+++ b/Modules/FindQt4.cmake
31@@ -517,7 +517,7 @@ endfunction() 31@@ -518,7 +518,7 @@ endfunction()
32 32
33 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) 33 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
34 34
@@ -37,7 +37,7 @@ index 847a798af..7ad981879 100644
37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) 37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
38 38
39 if (QT_QMAKE_EXECUTABLE AND 39 if (QT_QMAKE_EXECUTABLE AND
40@@ -1135,12 +1135,12 @@ if (QT_QMAKE_EXECUTABLE AND 40@@ -1136,12 +1136,12 @@ if (QT_QMAKE_EXECUTABLE AND
41 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) 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) 42 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) 43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)