diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 16:51:37 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-09 14:40:09 +0200 |
commit | 17f240dfa98e49f14637fd146ba1de20416d0971 (patch) | |
tree | 98ce4176aeacd53487c224704a8506621e0d5876 | |
parent | 12a40b841225b0d669b330dbdec1a01b0a99ddaa (diff) | |
download | meta-qt5-17f240dfa98e49f14637fd146ba1de20416d0971.tar.gz |
cmake: remove .bbappends, resolved in oe-core
* it's included in daisy and master branches
http://git.openembedded.org/openembedded-core/commit/?h=daisy&id=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend | 20 | ||||
-rw-r--r-- | recipes-devtools/cmake/cmake_2.8.12.2.bbappend | 20 |
2 files changed, 0 insertions, 40 deletions
diff --git a/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend b/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend deleted file mode 100644 index ebacf720..00000000 --- a/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable | ||
2 | # and possibly missing qmake binary (qtbase-native can be removed from sysroot | ||
3 | # e.g. in order to upgrade it, even when there is target qtbase) | ||
4 | |||
5 | #| -- Performing Test run_pic_test - Success | ||
6 | #| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | ||
7 | #| The imported target "Qt5::Core" references the file | ||
8 | #| | ||
9 | #| "/qmake" | ||
10 | #| | ||
11 | #| but this file does not exist. Possible reasons include: | ||
12 | |||
13 | do_configure_prepend() { | ||
14 | sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt | ||
15 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
16 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt | ||
17 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt | ||
18 | sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt | ||
19 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt | ||
20 | } | ||
diff --git a/recipes-devtools/cmake/cmake_2.8.12.2.bbappend b/recipes-devtools/cmake/cmake_2.8.12.2.bbappend deleted file mode 100644 index ebacf720..00000000 --- a/recipes-devtools/cmake/cmake_2.8.12.2.bbappend +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable | ||
2 | # and possibly missing qmake binary (qtbase-native can be removed from sysroot | ||
3 | # e.g. in order to upgrade it, even when there is target qtbase) | ||
4 | |||
5 | #| -- Performing Test run_pic_test - Success | ||
6 | #| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | ||
7 | #| The imported target "Qt5::Core" references the file | ||
8 | #| | ||
9 | #| "/qmake" | ||
10 | #| | ||
11 | #| but this file does not exist. Possible reasons include: | ||
12 | |||
13 | do_configure_prepend() { | ||
14 | sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt | ||
15 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
16 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt | ||
17 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt | ||
18 | sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt | ||
19 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt | ||
20 | } | ||