From 8d914b315d7bf0cf4fb3ded7c3e6d9b4b0591445 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 20 Apr 2014 16:51:37 +0200 Subject: [PATCH] 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 (From meta-qt5 rev: 17f240dfa98e49f14637fd146ba1de20416d0971) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../cmake/cmake-native_2.8.12.2.bbappend | 20 -------------------- .../recipes-devtools/cmake/cmake_2.8.12.2.bbappend | 20 -------------------- 2 files changed, 40 deletions(-) delete mode 100644 meta-qt5/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend delete mode 100644 meta-qt5/recipes-devtools/cmake/cmake_2.8.12.2.bbappend diff --git a/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend b/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend deleted file mode 100644 index ebacf72..0000000 --- a/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -# 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) - -#| -- Performing Test run_pic_test - Success -#| 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: - -do_configure_prepend() { - sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake - sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt - sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt - sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt -} diff --git a/meta-qt5/recipes-devtools/cmake/cmake_2.8.12.2.bbappend b/meta-qt5/recipes-devtools/cmake/cmake_2.8.12.2.bbappend deleted file mode 100644 index ebacf72..0000000 --- a/meta-qt5/recipes-devtools/cmake/cmake_2.8.12.2.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -# 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) - -#| -- Performing Test run_pic_test - Success -#| 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: - -do_configure_prepend() { - sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake - sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt - sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt - sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt -} -- 2.7.4