Fix west-opt command line position

Author: brondani

pkg/maker/west.go

@@ -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
 )
 `

test/data/solutions/west/out/core1/CM0/Debug/core1.Debug+CM0.cbuild.yml

@@ -39,3 +39,5 @@ build:
       - CONFIG_BUILD_OUTPUT_HEX: y
       - TARGET-DEF: on
       - CONFIG-DEBUG: y
+    west-opt:
+      - --verbose

test/data/solutions/west/ref/core1.Debug+CM0/CMakeLists.txt

@@ -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
@@ -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
 )

test/data/solutions/west/solution.csolution.yml

@@ -36,3 +36,5 @@ solution:
         device: :cm0_core1
         west-defs:
           - CORE: 1
+        west-opt:
+          - --verbose