diff options
| author | André Draszik <andre.draszik@jci.com> | 2018-02-23 14:50:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-03 17:08:28 +0000 |
| commit | 7620dafe7358f017a8cd558b480af73896768f04 (patch) | |
| tree | c9ed53939ebb4980c470d1c3bb6ec529a83f8900 | |
| parent | a7b0f7605f62420d7c9b9d5ef2e03c5cc5c81d03 (diff) | |
| download | openembedded-core-7620dafe7358f017a8cd558b480af73896768f04.tar.gz openembedded-core-7620dafe7358f017a8cd558b480af73896768f04.tar.bz2 openembedded-core-7620dafe7358f017a8cd558b480af73896768f04.zip | |
cmake: refactor compile and install for easier re-use
cmake_do_compile() and cmake_do_install() basically do the
same, except they use a different --target, and at the
moment this is copy/pasted code with a minor modification.
Other recipes which e.g. might want to support compilation
as part of ptest have to do the same. This is a bit
inconvenient.
By factoring out all of this into a common helper,
cmake_runcmake_build(), this is easily re-used. An
(imaginary) recipe can compile ptest support simply by
using
cmake_runcmake_build --target buildtest-TESTS
(assuming such a build target exists).
Also, this now is very similar to oe_runmake().
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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 d60dad8d66..fcfd5dda4f 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -159,14 +159,17 @@ cmake_do_configure() { -Wno-dev } +cmake_runcmake_build() { + bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD} + eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD} +} + cmake_do_compile() { - 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_runcmake_build --target ${OECMAKE_TARGET_COMPILE} } cmake_do_install() { - 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} + DESTDIR='${D}' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} } EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file |