summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-16 16:27:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:21 +0000
commit1cbc0400621c23243d96dedf4a226a732f5c87c9 (patch)
tree5574535c34d2ec84d27167584a28d389bd142c98 /meta
parent3821aee0129b87a859b3a540b82745fdae184721 (diff)
downloadopenembedded-core-1cbc0400621c23243d96dedf4a226a732f5c87c9.tar.gz
openembedded-core-1cbc0400621c23243d96dedf4a226a732f5c87c9.tar.bz2
openembedded-core-1cbc0400621c23243d96dedf4a226a732f5c87c9.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cmake.bbclass5
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