diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-01-16 13:25:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-17 16:32:41 +0000 |
| commit | 806765ec466597d38231d4be303cb48c26e21466 (patch) | |
| tree | 7f3f48811e0e45818e70e00f7a1d6bf67644f48c | |
| parent | 6d24b0bc7ebddd10de5ad8f210b8ed85fc6ae769 (diff) | |
| download | openembedded-core-806765ec466597d38231d4be303cb48c26e21466.tar.gz openembedded-core-806765ec466597d38231d4be303cb48c26e21466.tar.bz2 openembedded-core-806765ec466597d38231d4be303cb48c26e21466.zip | |
cmake: allow target names to be overridden
Don't hardcode the targets used in do_compile and do_install, instead build
"all" and "install" by default but respect OECMAKE_TARGET_COMPILE and
OECMAKE_TARGET_INSTALL variables.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cmake.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a4079dab0d..10c4edcf1a 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -34,6 +34,9 @@ EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " +OECMAKE_TARGET_COMPILE ?= "all" +OECMAKE_TARGET_INSTALL ?= "install" + FILES_${PN}-dev += "${libdir}/cmake ${datadir}/cmake" # CMake expects target architectures in the format of uname(2), @@ -140,13 +143,13 @@ cmake_do_configure() { do_compile[progress] = "percent" cmake_do_compile() { - bbnote VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} - VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} + bbnote VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} + VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} } cmake_do_install() { - bbnote DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} - DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} + bbnote DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} + DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} } EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file |