Commit 6779d3f3 authored by Håkon Øye Amundsen's avatar Håkon Øye Amundsen Committed by Anas Nashif
Browse files

cmake: Fix printed list of supported boards. 



Fixes issue #7184.

Use $BOARD_ROOT to find correct list of supported boards.
This is needed since the user can set this variable to any directory.
Pass $BOARD_ROOT to usage.cmake where it is called.

Signed-off-by: default avatarHåkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
parent eb6f2031

cmake/extensions.cmake

+3 −1
Original line number Diff line number Diff line
@@ -996,7 +996,9 @@ macro(assert_with_usage test comment) 
    message("see usage:")

    execute_process(

      COMMAND

      ${CMAKE_COMMAND} -P ${ZEPHYR_BASE}/cmake/usage/usage.cmake

      ${CMAKE_COMMAND}

      -DBOARD_ROOT=${BOARD_ROOT}

      -P ${ZEPHYR_BASE}/cmake/usage/usage.cmake

      )

    message(FATAL_ERROR "Invalid usage")

  endif()

cmake/usage/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line 
add_custom_target(

  usage

  ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/usage.cmake

  ${CMAKE_COMMAND}

  -DBOARD_ROOT=${BOARD_ROOT}

  -P ${CMAKE_CURRENT_SOURCE_DIR}/usage.cmake

  )



add_custom_target(

cmake/usage/usage.cmake

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ set(arch_list 
  xtensa

  )



set(board_dir $ENV{ZEPHYR_BASE}/boards)

set(board_dir ${BOARD_ROOT}/boards)



foreach(arch ${arch_list})

  set(board_arch_dir ${board_dir}/${arch})

CRA Git | Maintained and supported by SUSTech CRA and CCSE