summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake.inc
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-07-04 12:26:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 09:42:00 +0100
commit09fea03644f15af45e5fac8fd035f74e3cd9146f (patch)
treecf45d9358c04080fc0760972ca02d8cbf8a4a64a /meta/recipes-devtools/cmake/cmake.inc
parent89a8dcc9e8666111a42664d9185d39b04361d56f (diff)
downloadast2050-yocto-poky-09fea03644f15af45e5fac8fd035f74e3cd9146f.zip
ast2050-yocto-poky-09fea03644f15af45e5fac8fd035f74e3cd9146f.tar.gz
cmake: fix configure error if system Qt installation is broken
If the host Qt installation exists but is incomplete or the installed qmake architecture doesn't match that of the Qt libraries, cmake was failing at do_configure. cmake 2.8.10 failed silently here so we should make 2.8.11 do the same. Fixes [YOCTO #4565]. (From OE-Core rev: 2bf46fbd25e1a3a44d556758f536fa26c44edb03) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake.inc')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6144d51..014ff5a 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -15,6 +15,7 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
file://support-oe-qt4-tools-names.patch \
file://aarch64-cmake.patch \
file://aarch64-kwsys.patch \
+ file://qt4-fail-silent.patch \
"
inherit autotools
OpenPOWER on IntegriCloud