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
4 changes: 2 additions & 2 deletions pkg/maker/west.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ set(ENV_VARS

# Compilation database
add_custom_target(database
COMMAND cmake -E env ${ENV_VARS} west build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only` + westOptionsRef + ` "${WEST_APP}"` + westDefsRef + `
COMMAND cmake -E env ${ENV_VARS} west` + westOptionsRef + ` build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}"` + westDefsRef + `
USES_TERMINAL
)

# West build
add_custom_target(west
COMMAND cmake -E env ${ENV_VARS} west build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto` + westOptionsRef + ` "${WEST_APP}"` + westDefsRef + `
COMMAND cmake -E env ${ENV_VARS} west` + westOptionsRef + ` build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto "${WEST_APP}"` + westDefsRef + `
USES_TERMINAL
)
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ build:
- CONFIG_BUILD_OUTPUT_HEX: y
- TARGET-DEF: on
- CONFIG-DEBUG: y
west-opt:
- --verbose
7 changes: 5 additions & 2 deletions test/data/solutions/west/ref/core1.Debug+CM0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ include("toolchain.cmake")
# Setup project
project(${CONTEXT} LANGUAGES NONE)

set(WEST_OPTIONS
--verbose
)
set(WEST_DEFS
-DCORE=1
-DCONFIG_BUILD_OUTPUT_HEX=y
Expand All @@ -32,12 +35,12 @@ set(ENV_VARS

# Compilation database
add_custom_target(database
COMMAND cmake -E env ${ENV_VARS} west build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}" -- ${WEST_DEFS}
COMMAND cmake -E env ${ENV_VARS} west ${WEST_OPTIONS} build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto --cmake-only "${WEST_APP}" -- ${WEST_DEFS}
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 -E env ${ENV_VARS} west ${WEST_OPTIONS} build -b ${WEST_BOARD} -d "${OUT_DIR}" -p auto "${WEST_APP}" -- ${WEST_DEFS}
USES_TERMINAL
)
2 changes: 2 additions & 0 deletions test/data/solutions/west/solution.csolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ solution:
device: :cm0_core1
west-defs:
- CORE: 1
west-opt:
- --verbose
Loading