[OE-core] [PATCH 1/2] cmake: don't inherit autotools
Ross Burton
ross.burton at intel.com
Tue Feb 16 16:27:19 UTC 2016
autotools was inherited for some functions some time ago, but now all it's using
it for explicitly is autotools_do_install(), which is basically just "make
install". Invoke that directly and we can remove the inherit autotools.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/cmake.bbclass | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 70e8677..22cd61e 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -7,9 +7,6 @@ B = "${WORKDIR}/build"
# We need to unset CCACHE otherwise cmake gets too confused
CCACHE = ""
-# We want the staging and installing functions from autotools
-inherit autotools
-
# C/C++ Compiler (without cpu arch/tune arguments)
OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
@@ -132,7 +129,7 @@ cmake_do_compile() {
cmake_do_install() {
cd ${B}
- autotools_do_install
+ oe_runmake 'DESTDIR=${D}' install
}
EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file
--
2.7.0
More information about the Openembedded-core
mailing list