diff options
author | Ross Burton <ross.burton@intel.com> | 2016-02-16 16:27:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:39:30 +0000 |
commit | 35011d9ac609672bd388e7e1679d6e6520f0b7c8 (patch) | |
tree | b8580c620693ccd0e605c33d4eb9a5fca9a224ae /meta/classes/cmake.bbclass | |
parent | 9cd64edebf1b559c07fa9387a9013f7ec76648ce (diff) | |
download | openembedded-core-contrib-35011d9ac609672bd388e7e1679d6e6520f0b7c8.tar.gz |
cmake: don't inherit autotools
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.
(From OE-Core rev: 1cbc0400621c23243d96dedf4a226a732f5c87c9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cmake.bbclass')
-rw-r--r-- | meta/classes/cmake.bbclass | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 70e8677fc1..22cd61eb06 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 |