diff options
| author | Daniel McGregor <daniel.mcgregor@vecima.com> | 2020-01-23 15:44:42 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 15:56:29 +0000 |
| commit | a26efa2875e99ae9abf68dffe7bd988c3fd8598a (patch) | |
| tree | f9155d40438aa73497d97f6662380e6a65af7bf1 /meta/classes/cmake.bbclass | |
| parent | e6daaf97b3aa39073caa18e0632bb3ff190bbc94 (diff) | |
| download | poky-a26efa2875e99ae9abf68dffe7bd988c3fd8598a.tar.gz | |
cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL
cmake 3.12 introduced this environment variable. Prefer it to passing
PARALLEL_MAKE and PARALLEL_MAKEINST on the cmake command line, because
it gets passed to second stage cmake invocations while command-line
arguments do not (for example, multi-stage clang builds)
(From OE-Core rev: cdd44c93f02bb8cc2fa773e13c8ce36e3da23921)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cmake.bbclass')
| -rw-r--r-- | meta/classes/cmake.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a046daa6ea..d91cf20130 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
| @@ -63,8 +63,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" | |||
| 63 | 63 | ||
| 64 | EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" | 64 | EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" |
| 65 | 65 | ||
| 66 | EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " | 66 | export CMAKE_BUILD_PARALLEL_LEVEL |
| 67 | EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " | 67 | CMAKE_BUILD_PARALLEL_LEVEL_task-compile = "${@oe.utils.parallel_make(d, False)}" |
| 68 | CMAKE_BUILD_PARALLEL_LEVEL_task-install = "${@oe.utils.parallel_make(d, True)}" | ||
| 68 | 69 | ||
| 69 | OECMAKE_TARGET_COMPILE ?= "all" | 70 | OECMAKE_TARGET_COMPILE ?= "all" |
| 70 | OECMAKE_TARGET_INSTALL ?= "install" | 71 | OECMAKE_TARGET_INSTALL ?= "install" |