diff options
| -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() { | |||
| 159 | -Wno-dev | 159 | -Wno-dev |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | cmake_runcmake_build() { | ||
| 163 | bbnote ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD} | ||
| 164 | eval ${DESTDIR:+DESTDIR=${DESTDIR} }VERBOSE=1 cmake --build '${B}' "$@" -- ${EXTRA_OECMAKE_BUILD} | ||
| 165 | } | ||
| 166 | |||
| 162 | cmake_do_compile() { | 167 | cmake_do_compile() { |
| 163 | bbnote VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} | 168 | cmake_runcmake_build --target ${OECMAKE_TARGET_COMPILE} |
| 164 | VERBOSE=1 cmake --build '${B}' --target ${OECMAKE_TARGET_COMPILE} -- ${EXTRA_OECMAKE_BUILD} | ||
| 165 | } | 169 | } |
| 166 | 170 | ||
| 167 | cmake_do_install() { | 171 | cmake_do_install() { |
| 168 | bbnote DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} | 172 | DESTDIR='${D}' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} |
| 169 | DESTDIR='${D}' cmake --build '${B}' --target ${OECMAKE_TARGET_INSTALL} -- ${EXTRA_OECMAKE_BUILD} | ||
| 170 | } | 173 | } |
| 171 | 174 | ||
| 172 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file | 175 | EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file |
