* [PATCH v2 1/2] cmake.bbclass: remove unneded cd ${B}
@ 2017-05-04 17:50 Cody P Schafer
2017-05-04 17:50 ` [PATCH v2 2/2] cmake.bbclass: use `cmake --build` to build & install Cody P Schafer
0 siblings, 1 reply; 2+ messages in thread
From: Cody P Schafer @ 2017-05-04 17:50 UTC (permalink / raw)
To: openembedded-core
The default dir for do_compile & do_configure is already ${B}, no need
to cd (other than broken appends)
CC: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Cody P Schafer <dev@codyps.com>
---
meta/classes/cmake.bbclass | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 12df617ad8..8b5f18d8e0 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -135,12 +135,10 @@ cmake_do_configure() {
do_compile[progress] = "percent"
cmake_do_compile() {
- cd ${B}
base_do_compile VERBOSE=1
}
cmake_do_install() {
- cd ${B}
oe_runmake 'DESTDIR=${D}' install
}
--
2.12.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] cmake.bbclass: use `cmake --build` to build & install
2017-05-04 17:50 [PATCH v2 1/2] cmake.bbclass: remove unneded cd ${B} Cody P Schafer
@ 2017-05-04 17:50 ` Cody P Schafer
0 siblings, 0 replies; 2+ messages in thread
From: Cody P Schafer @ 2017-05-04 17:50 UTC (permalink / raw)
To: openembedded-core
Rather than presuming `make` is the generator, use cmake's generic
`cmake --build` feature (which knows to call the appropriate generator).
Both DESTDIR and VERBOSE still behave as intended when used as
environment variables instead of make variable-arguments.
As cmake-based builds don't do any configuration with `make`
invocations, we only pass `PARALLEL_MAKE{,INST}` (via a
EXTRA_OECMAKE_BUILD variable) to the underlying build tool. Make &
ninja support the same `-j N` option (and a few others), so this does
happen to work for both.
This makes it more straight forward for others to select other cmake
generators (many folks have been reaching for `ninja` lately).
CC: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Cody P Schafer <dev@codyps.com>
---
meta/classes/cmake.bbclass | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 8b5f18d8e0..ac2c1519b0 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -31,6 +31,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
+EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} "
+EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} "
+
# CMake expects target architectures in the format of uname(2),
# which do not always match TARGET_ARCH, so all the necessary
# conversions should happen here.
@@ -135,11 +138,13 @@ cmake_do_configure() {
do_compile[progress] = "percent"
cmake_do_compile() {
- base_do_compile VERBOSE=1
+ bbnote VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD}
+ VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD}
}
cmake_do_install() {
- oe_runmake 'DESTDIR=${D}' install
+ bbnote DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD}
+ DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD}
}
EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file
--
2.12.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-04 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-04 17:50 [PATCH v2 1/2] cmake.bbclass: remove unneded cd ${B} Cody P Schafer
2017-05-04 17:50 ` [PATCH v2 2/2] cmake.bbclass: use `cmake --build` to build & install Cody P Schafer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.