mirror of
https://github.com/apache/nuttx.git
synced 2026-08-14 08:53:15 +00:00
87260499e1
Some checks are pending
MemBrowse Memory Report / changes-filter (push) Waiting to run
MemBrowse Memory Report / load-targets (push) Waiting to run
MemBrowse Memory Report / identical (push) Blocked by required conditions
MemBrowse Memory Report / analyze (push) Blocked by required conditions
This change fixes NuttX’s CMake support when NuttX is embedded in another project via add_subdirectory(). CMake’s CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR refer to the outermost project, causing NuttX to access its .config, generated files, host tools, and build artifacts in the parent project’s directories. The fix introduces NUTTX_DIR and NUTTX_BINARY_DIR, based on CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR, and consistently uses them for NuttX self-references while preserving existing standalone builds. It fixes the Kconfig initialization failure reported in #19697 and allows an embedded sim:nsh build to configure, build, and boot successfully. The change affects only the CMake build system (not Make or Kconfig defaults), requires the corresponding nuttx-apps change, and does not extend add_subdirectory() support to cross-compiled non-sim boards due to CMake’s toolchain-file limitation. Fixes #19697. Assisted-by: Claude:claude-sonnet-5 Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| elf.h | ||
| elf_addrenv.c | ||
| elf_bind.c | ||
| elf_depend.c | ||
| elf_gethandle.c | ||
| elf_getsymbol.c | ||
| elf_globals.S | ||
| elf_init.c | ||
| elf_insert.c | ||
| elf_iobuffer.c | ||
| elf_load.c | ||
| elf_loadhdrs.c | ||
| elf_read.c | ||
| elf_registry.c | ||
| elf_remove.c | ||
| elf_sections.c | ||
| elf_symbols.c | ||
| elf_symtab.c | ||
| elf_uninit.c | ||
| elf_unload.c | ||
| elf_verify.c | ||
| gnu-elf.ld.in | ||
| Kconfig | ||
| Make.defs | ||
| Makefile | ||