From 60ef8543f42607eb7a790156cd53009eca5371af Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 18 Dec 2020 17:34:25 +0000 Subject: [PATCH] arm/trusted-firmware-m: improve CMake calls Use cmake more idiomatically, and enable verbose builds. Change-Id: I908af71f4662fab1dde9de86fc7a56ca3701e0c5 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../trusted-firmware-m/trusted-firmware-m_1.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb index d35099d4..630379a4 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb @@ -80,6 +80,9 @@ EXTRA_OECMAKE += "-DCOMPILER=${TFM_COMPILER}" EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Debug', '', d)}" EXTRA_OECMAKE += "-DPROJ_CONFIG=${S}/configs/${TFM_CONFIG}" +# Verbose builds +EXTRA_OECMAKE += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" + # Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application CFLAGS[unexport] = "1" LDFLAGS[unexport] = "1" @@ -99,7 +102,7 @@ do_check_config() { do_configure[cleandirs] = "${B}" do_configure() { - cmake -G"Unix Makefiles" --build ${S} ${EXTRA_OECMAKE} + cmake -G"Unix Makefiles" ${S} ${EXTRA_OECMAKE} } # Invoke install here as there's no point in splitting compile from install: the @@ -107,7 +110,7 @@ do_configure() { # rebuild. It also overrides the install prefix to be in the build tree, so you # can't use the usual install prefix variables. do_compile() { - oe_runmake install + cmake --build ./ -- install } do_install() {