mirror of
https://github.com/apache/nuttx.git
synced 2026-08-27 12:20:46 +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>
72 lines
1.9 KiB
CMake
72 lines
1.9 KiB
CMake
# ##############################################################################
|
|
# binfmt/CMakeLists.txt
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
|
|
# license agreements. See the NOTICE file distributed with this work for
|
|
# additional information regarding copyright ownership. The ASF licenses this
|
|
# file to you under the Apache License, Version 2.0 (the "License"); you may not
|
|
# use this file except in compliance with the License. You may obtain a copy of
|
|
# the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations under
|
|
# the License.
|
|
#
|
|
# ##############################################################################
|
|
|
|
set(SRCS)
|
|
|
|
nuttx_add_kernel_library(binfmt)
|
|
|
|
nuttx_add_subdirectory()
|
|
|
|
list(
|
|
APPEND
|
|
SRCS
|
|
binfmt_globals.c
|
|
binfmt_initialize.c
|
|
binfmt_register.c
|
|
binfmt_unregister.c
|
|
binfmt_loadmodule.c
|
|
binfmt_unloadmodule.c
|
|
binfmt_execmodule.c
|
|
binfmt_exec.c
|
|
binfmt_copyargv.c
|
|
binfmt_copyactions.c
|
|
binfmt_dumpmodule.c)
|
|
|
|
if(CONFIG_SCHED_USER_IDENTITY)
|
|
list(APPEND SRCS binfmt_checkexec.c)
|
|
endif()
|
|
|
|
if(CONFIG_BINFMT_LOADABLE)
|
|
list(APPEND SRCS binfmt_exit.c)
|
|
endif()
|
|
|
|
if(CONFIG_LIBC_EXECFUNCS)
|
|
list(APPEND SRCS binfmt_execsymtab.c)
|
|
endif()
|
|
|
|
if(CONFIG_ELF)
|
|
list(APPEND SRCS elf.c)
|
|
endif()
|
|
|
|
if(CONFIG_NXFLAT)
|
|
list(APPEND SRCS nxflat.c)
|
|
endif()
|
|
|
|
# Builtin application interfaces
|
|
|
|
if(CONFIG_BUILTIN)
|
|
list(APPEND SRCS builtin.c)
|
|
endif()
|
|
|
|
target_sources(binfmt PRIVATE ${SRCS})
|
|
target_include_directories(binfmt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
|
target_include_directories(binfmt PRIVATE ${NUTTX_DIR}/sched)
|