Skip to content

Commit

Permalink
cmake: NUTTX_COMMON_DIR must be set after .config definitions are inc…
Browse files Browse the repository at this point in the history
…luded

otherwise NUTTX_COMMON_DIR is empty if CONFIG_ARCH_BOARD_COMMON is set from menuconfig

Co-authored-by: hartmannathan <59230071+hartmannathan@users.noreply.github.com>
  • Loading branch information
2 people authored and acassis committed Dec 12, 2023
1 parent 7bcbaa5 commit 267d039
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,6 @@ else()
file(TOUCH ${CMAKE_BINARY_DIR}/drivers/platform/Kconfig)
endif()

# board common directory

if(CONFIG_ARCH_BOARD_COMMON)
file(
GLOB NUTTX_COMMON_DIR
LIST_DIRECTORIES true
"${NUTTX_DIR}/boards/${CONFIG_ARCH}/${CONFIG_ARCH_CHIP}/common")
endif()

# Custom chip ###################################################

if(CONFIG_ARCH_CHIP_CUSTOM)
Expand Down Expand Up @@ -388,6 +379,15 @@ include(FetchContent)

set(FETCHCONTENT_QUIET OFF)

# Board common directory #####################################################

if(CONFIG_ARCH_BOARD_COMMON)
file(
GLOB NUTTX_COMMON_DIR
LIST_DIRECTORIES true
"${NUTTX_DIR}/boards/${CONFIG_ARCH}/${CONFIG_ARCH_CHIP}/common")
endif()

# Setup toolchain ############################################################

# This needs to happen before project() when binaries are searched for
Expand Down

0 comments on commit 267d039

Please sign in to comment.