mirror of
https://github.com/apache/nuttx.git
synced 2026-08-12 07:55:32 +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> |
||
|---|---|---|
| .. | ||
| menuconfig.cmake | ||
| nuttx_3rdparty.cmake | ||
| nuttx_add_application.cmake | ||
| nuttx_add_dependencies.cmake | ||
| nuttx_add_library.cmake | ||
| nuttx_add_module.cmake | ||
| nuttx_add_romfs.cmake | ||
| nuttx_add_subdirectory.cmake | ||
| nuttx_add_symtab.cmake | ||
| nuttx_create_symlink.cmake | ||
| nuttx_export_header.cmake | ||
| nuttx_extensions.cmake | ||
| nuttx_generate_headers.cmake | ||
| nuttx_generate_outputs.cmake | ||
| nuttx_generate_sim_ld.cmake | ||
| nuttx_kconfig.cmake | ||
| nuttx_mkconfig.cmake | ||
| nuttx_mkversion.cmake | ||
| nuttx_multiple_link.cmake | ||
| nuttx_overrides.cmake | ||
| nuttx_parse_function_args.cmake | ||
| nuttx_process_config.cmake | ||
| nuttx_redefine_symbols.cmake | ||
| nuttx_remove_compile_options.cmake | ||
| nuttx_sethost.cmake | ||
| nuttx_source_file_properties.cmake | ||
| nuttx_toolchain.cmake | ||
| savedefconfig.cmake | ||
| symtab.c.in | ||