aboutsummaryrefslogtreecommitdiffstats
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
committerSaul Wold <sgw@linux.intel.com>2013-07-09 07:56:14 -0700
commit2bf46fbd25e1a3a44d556758f536fa26c44edb03 (patch)
tree9ea21e630e91d46a4b39051ec24a2a163354b2e6 /meta/recipes-devtools/cmake/cmake.inc
parentfaa8cc6c2a582a32c695f3f2b0d45b6892c769fd (diff)
downloadopenembedded-core-contrib-2bf46fbd25e1a3a44d556758f536fa26c44edb03.tar.gz
openembedded-core-contrib-2bf46fbd25e1a3a44d556758f536fa26c44edb03.tar.bz2
openembedded-core-contrib-2bf46fbd25e1a3a44d556758f536fa26c44edb03.zip
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 6144d51be4..014ff5a750 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