Skip to contentSkip to conversation

cmake: refactor compile and install for easier re-use

PATCH In review André Draszik 2 participants 3 messages Feb 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake: refactor compile and install for easier re-use

From: André Draszik <[email protected]>

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().

---
 meta/classes/cmake.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
meta/classes/cmake.bbclass +7 -4
index d60dad8d66..fcfd5dda4f 100644
@@ -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
Signature · 1 line
2.16.1
#1 lore raw
Quoted 10 lines · André Draszik

From: André Draszik <[email protected]>

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.

Quoted 9 lines

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().

If it’s similar to oe_runmake, why the long overly verbose function name for the new function? Is oe_runcmake not viable?

Signature · 4 lines
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
#2 lore raw

On 23 Feb 2018 20:32, "Christopher Larson" <[email protected]> wrote:

Quoted 5 lines · André Draszik

From: André Draszik <[email protected]>

[...]
Also, this now is very similar to oe_runmake().

If it’s similar to oe_runmake, why the long overly verbose function name for the new function? Is oe_runcmake not viable?

I was contemplating that, but in the end thought no as I'd personally find it confusing. This is not running cmake, in that cmake alone generates the build system files (make files, ninja build, msvc solutions, etc). It is running cmake --build to execute the actual build (make, ninja, etc), hence the name.

I'm open for other thoughts...

A.