diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2014-04-02 12:25:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:53:50 +0100 |
| commit | 71bed6516ac23a7dd3e1b9af0b308ee539dc0d6f (patch) | |
| tree | 82c61f15b94de52069a2695fa1ddf4026dfc6094 | |
| parent | 342322c7bb97ab54f5caeb241810a715e78d8d21 (diff) | |
| download | poky-71bed6516ac23a7dd3e1b9af0b308ee539dc0d6f.tar.gz | |
cmake: Add ugly hack from meta-qt5 to prevent cmake trying to detect qt5
* cmake doesn't have dependency on qt4/qt5, so these tests usually fail
but still can cause undeterministic results or build failures (when
OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed
while running the test in cmake)
(From OE-Core rev: 4f2dee0d8c2c3f60cb8f8021343e973cae31fc50)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 1d5303fdb2..a0fcf490ec 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
| @@ -21,6 +21,28 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz | |||
| 21 | 21 | ||
| 22 | inherit autotools-brokensep | 22 | inherit autotools-brokensep |
| 23 | 23 | ||
| 24 | # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable | ||
| 25 | # and possibly missing qmake binary (qtbase-native can be removed from sysroot | ||
| 26 | # e.g. in order to upgrade it, even when there is target qtbase) | ||
| 27 | |||
| 28 | # Fixes errors like this in cmake(-native).do_configure: | ||
| 29 | #| -- Performing Test run_pic_test - Success | ||
| 30 | #| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | ||
| 31 | #| The imported target "Qt5::Core" references the file | ||
| 32 | #| | ||
| 33 | #| "/qmake" | ||
| 34 | #| | ||
| 35 | #| but this file does not exist. Possible reasons include: | ||
| 36 | |||
| 37 | do_configure_prepend() { | ||
| 38 | sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt | ||
| 39 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
| 40 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt | ||
| 41 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt | ||
| 42 | sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt | ||
| 43 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt | ||
| 44 | } | ||
| 45 | |||
| 24 | do_configure () { | 46 | do_configure () { |
| 25 | ./configure --prefix=${prefix} | 47 | ./configure --prefix=${prefix} |
| 26 | } | 48 | } |
