From fbd0b3d1d783cc8c1834db7a05c884466754e29b Mon Sep 17 00:00:00 2001 From: zhanghongyu Date: Tue, 31 Oct 2023 17:50:41 +0800 Subject: [PATCH] cmake: move NUTTX_CHIP_ABS_DIR before common src Some APIs are implemented both in common code and CHIP-specific code, and the link needs to be based on the implementation in CHIP, so move NUTTX_CHIP_ABS_DIR before common src. Signed-off-by: zhanghongyu --- arch/arm/src/CMakeLists.txt | 2 +- arch/risc-v/src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/CMakeLists.txt b/arch/arm/src/CMakeLists.txt index e459f0853c..21bea7ee80 100644 --- a/arch/arm/src/CMakeLists.txt +++ b/arch/arm/src/CMakeLists.txt @@ -18,9 +18,9 @@ # # ############################################################################## -add_subdirectory(common) add_subdirectory(${ARCH_SUBDIR}) add_subdirectory(${NUTTX_CHIP_ABS_DIR} EXCLUDE_FROM_ALL exclude_chip) +add_subdirectory(common) # Include directories (before system ones) as PUBLIC so that it can be exposed # to libboard diff --git a/arch/risc-v/src/CMakeLists.txt b/arch/risc-v/src/CMakeLists.txt index bd3065f2bd..8dda0f61b0 100644 --- a/arch/risc-v/src/CMakeLists.txt +++ b/arch/risc-v/src/CMakeLists.txt @@ -18,8 +18,8 @@ # # ############################################################################## -add_subdirectory(common) add_subdirectory(${NUTTX_CHIP_ABS_DIR} EXCLUDE_FROM_ALL exclude_chip) +add_subdirectory(common) # Include directories (before system ones) as PUBLIC so that it can be exposed # to libboard