From 671313d0b5e09e0b49a90ed944cd33fb3d6457b0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 5 Sep 2013 15:16:37 +0200 Subject: [PATCH] cmake: disable test for Qt5Core | CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | The imported target "Qt5::Core" references the file | | "/qmake" | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | "tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake" | | but not all the files it references. | | Call Stack (most recent call first): | tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists) | tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:130 (include) | Tests/RunCMake/CMakeLists.txt:80 (find_package) Signed-off-by: Martin Jansa --- conf/layer.conf | 2 +- recipes-devtools/cmake/cmake_2.8.11.2.bbappend | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 recipes-devtools/cmake/cmake_2.8.11.2.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index 2aee9a5599..3b47b7f7a3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -12,7 +12,7 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "qt5-layer" BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/" diff --git a/recipes-devtools/cmake/cmake_2.8.11.2.bbappend b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend new file mode 100644 index 0000000000..0ad2d2fb48 --- /dev/null +++ b/recipes-devtools/cmake/cmake_2.8.11.2.bbappend @@ -0,0 +1,7 @@ +# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable +# and possibly missing qmake binary (qtbase-native can be removed from sysroot +# e.g. in order to upgrade it, even when there is target qtbase) + +do_configure_prepend() { + sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt +}