diff options
| -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" | |||
| 7 | # We need to unset CCACHE otherwise cmake gets too confused | 7 | # We need to unset CCACHE otherwise cmake gets too confused |
| 8 | CCACHE = "" | 8 | CCACHE = "" |
| 9 | 9 | ||
| 10 | # We want the staging and installing functions from autotools | ||
| 11 | inherit autotools | ||
| 12 | |||
| 13 | # C/C++ Compiler (without cpu arch/tune arguments) | 10 | # C/C++ Compiler (without cpu arch/tune arguments) |
| 14 | OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" | 11 | OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" |
| 15 | OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" | 12 | OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" |
| @@ -132,7 +129,7 @@ cmake_do_compile() { | |||
| 132 | 129 | ||
| 133 | cmake_do_install() { | 130 | cmake_do_install() { |
| 134 | cd ${B} | 131 | cd ${B} |
| 135 | autotools_do_install | 132 | oe_runmake 'DESTDIR=${D}' install |
| 136 | } | 133 | } |
| 137 | 134 | ||
| 138 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file | 135 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file |
