This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 267d039295 cmake: NUTTX_COMMON_DIR must be set after .config
definitions are included
267d039295 is described below
commit 267d039295cd76fc44a93a30fa94d48bc9cf07e2
Author: raiden00pl <raide...@railab.me>
AuthorDate: Tue Dec 12 15:14:33 2023 +0100
cmake: NUTTX_COMMON_DIR must be set after .config definitions are included
otherwise NUTTX_COMMON_DIR is empty if CONFIG_ARCH_BOARD_COMMON is set from
menuconfig
Co-authored-by: hartmannathan
<59230071+hartmannat...@users.noreply.github.com>
---
CMakeLists.txt | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efddcd1be9..80f03424ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -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
