sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2016-02-16 16:27:19 +00:00 committed by Richard Purdie
parent 9cd64edebf
commit 35011d9ac6
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/cmake.bbclass
View File

@ -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