Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pkg/maker/west.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025 Arm Limited. All rights reserved.
* Copyright (c) 2025-2026 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -90,15 +90,24 @@ set(ENV_VARS
ZEPHYR_TOOLCHAIN_VARIANT="` + westToolchain + `"
)

# Compilation database
add_custom_target(database
# West setup and compilation database
add_custom_target(database DEPENDS "${OUT_DIR}/CMakeCache.txt")
add_custom_command(
OUTPUT "${OUT_DIR}/CMakeCache.txt"
BYPRODUCTS "${OUT_DIR}/compile_commands.json"
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Setup west build directory"
COMMAND cmake -E env ${ENV_VARS} west` + westOptionsRef + ` build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}"` + westDefsRef + `
COMMENT ""
DEPENDS "${CMAKE_CURRENT_LIST_FILE}"
USES_TERMINAL
)

# West build
add_custom_target(west
COMMAND cmake -E env ${ENV_VARS} west` + westOptionsRef + ` build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto "${WEST_APP}"` + westDefsRef + `
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Run west build"
COMMAND west build -d "${OUT_DIR}"
COMMENT ""
DEPENDS database
USES_TERMINAL
)
`
Expand Down
15 changes: 12 additions & 3 deletions test/data/solutions/west/ref/core0.Debug+CM0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,23 @@ set(ENV_VARS
ZEPHYR_TOOLCHAIN_VARIANT="armclang"
)

# Compilation database
add_custom_target(database
# West setup and compilation database
add_custom_target(database DEPENDS "${OUT_DIR}/CMakeCache.txt")
add_custom_command(
OUTPUT "${OUT_DIR}/CMakeCache.txt"
BYPRODUCTS "${OUT_DIR}/compile_commands.json"
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Setup west build directory"
COMMAND cmake -E env ${ENV_VARS} west build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}" -- ${WEST_DEFS}
COMMENT ""
DEPENDS "${CMAKE_CURRENT_LIST_FILE}"
USES_TERMINAL
)

# West build
add_custom_target(west
COMMAND cmake -E env ${ENV_VARS} west build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto "${WEST_APP}" -- ${WEST_DEFS}
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Run west build"
COMMAND west build -d "${OUT_DIR}"
COMMENT ""
DEPENDS database
USES_TERMINAL
)
15 changes: 12 additions & 3 deletions test/data/solutions/west/ref/core1.Debug+CM0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,23 @@ set(ENV_VARS
ZEPHYR_TOOLCHAIN_VARIANT="armclang"
)

# Compilation database
add_custom_target(database
# West setup and compilation database
add_custom_target(database DEPENDS "${OUT_DIR}/CMakeCache.txt")
add_custom_command(
OUTPUT "${OUT_DIR}/CMakeCache.txt"
BYPRODUCTS "${OUT_DIR}/compile_commands.json"
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Setup west build directory"
COMMAND cmake -E env ${ENV_VARS} west ${WEST_OPTIONS} build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}" -- ${WEST_DEFS}
COMMENT ""
DEPENDS "${CMAKE_CURRENT_LIST_FILE}"
USES_TERMINAL
)

# West build
add_custom_target(west
COMMAND cmake -E env ${ENV_VARS} west ${WEST_OPTIONS} build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto "${WEST_APP}" -- ${WEST_DEFS}
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue " Run west build"
COMMAND west build -d "${OUT_DIR}"
COMMENT ""
DEPENDS database
USES_TERMINAL
)
Loading