diff options
Diffstat (limited to 'meta/classes/cmake.bbclass')
| -rw-r--r-- | meta/classes/cmake.bbclass | 9 |
1 files 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" | |||
| 31 | 31 | ||
| 32 | EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" | 32 | EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}" |
| 33 | 33 | ||
| 34 | EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} " | ||
| 35 | EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " | ||
| 36 | |||
| 34 | # CMake expects target architectures in the format of uname(2), | 37 | # CMake expects target architectures in the format of uname(2), |
| 35 | # which do not always match TARGET_ARCH, so all the necessary | 38 | # which do not always match TARGET_ARCH, so all the necessary |
| 36 | # conversions should happen here. | 39 | # conversions should happen here. |
| @@ -135,11 +138,13 @@ cmake_do_configure() { | |||
| 135 | 138 | ||
| 136 | do_compile[progress] = "percent" | 139 | do_compile[progress] = "percent" |
| 137 | cmake_do_compile() { | 140 | cmake_do_compile() { |
| 138 | base_do_compile VERBOSE=1 | 141 | bbnote VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} |
| 142 | VERBOSE=1 cmake --build '${B}' -- ${EXTRA_OECMAKE_BUILD} | ||
| 139 | } | 143 | } |
| 140 | 144 | ||
| 141 | cmake_do_install() { | 145 | cmake_do_install() { |
| 142 | oe_runmake 'DESTDIR=${D}' install | 146 | bbnote DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} |
| 147 | DESTDIR='${D}' cmake --build '${B}' --target install -- ${EXTRA_OECMAKE_BUILD} | ||
| 143 | } | 148 | } |
| 144 | 149 | ||
| 145 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file | 150 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file |
