mirror of
https://github.com/apache/nuttx.git
synced 2026-08-25 15:37:23 +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>
69 lines
2.6 KiB
CMake
69 lines
2.6 KiB
CMake
# ##############################################################################
|
|
# cmake/nuttx_generate_outputs.cmake
|
|
#
|
|
# 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.
|
|
#
|
|
# ##############################################################################
|
|
|
|
function(nuttx_generate_outputs target)
|
|
if(CONFIG_INTELHEX_BINARY)
|
|
add_custom_command(
|
|
OUTPUT ${target}.hex
|
|
COMMAND ${CMAKE_OBJCOPY} -O ihex ${target} ${target}.hex
|
|
DEPENDS ${target})
|
|
add_custom_target(${target}-hex ALL DEPENDS ${target}.hex)
|
|
add_dependencies(nuttx_post ${target}-hex)
|
|
file(APPEND ${NUTTX_BINARY_DIR}/nuttx.manifest "${target}.hex\n")
|
|
endif()
|
|
|
|
if(CONFIG_MOTOROLA_SREC)
|
|
add_custom_command(
|
|
OUTPUT ${target}.srec
|
|
COMMAND ${CMAKE_OBJCOPY} -O srec ${target} ${target}.srec
|
|
DEPENDS ${target})
|
|
add_custom_target(${target}-srec ALL DEPENDS ${target}.srec)
|
|
add_dependencies(nuttx_post ${target}-srec)
|
|
file(APPEND ${NUTTX_BINARY_DIR}/nuttx.manifest "${target}.srec\n")
|
|
endif()
|
|
|
|
if(CONFIG_RAW_BINARY)
|
|
add_custom_command(
|
|
OUTPUT ${target}.bin
|
|
COMMAND ${CMAKE_OBJCOPY} -O binary ${target} ${target}.bin
|
|
DEPENDS ${target})
|
|
add_custom_target(${target}-bin ALL DEPENDS ${target}.bin)
|
|
add_dependencies(nuttx_post ${target}-bin)
|
|
file(APPEND ${NUTTX_BINARY_DIR}/nuttx.manifest "${target}.bin\n")
|
|
endif()
|
|
|
|
if(CONFIG_RAW_DISASSEMBLY)
|
|
if(CONFIG_ARCH_TOOLCHAIN_GHS)
|
|
add_custom_command(
|
|
OUTPUT ${target}.asm
|
|
COMMAND ${CMAKE_OBJDUMP} ${target} -ytext -yl -yp > ${target}.asm
|
|
DEPENDS ${target})
|
|
else()
|
|
add_custom_command(
|
|
OUTPUT ${target}.asm
|
|
COMMAND ${CMAKE_OBJDUMP} -d ${target} > ${target}.asm
|
|
DEPENDS ${target})
|
|
endif()
|
|
add_custom_target(${target}-asm ALL DEPENDS ${target}.asm)
|
|
file(APPEND ${NUTTX_BINARY_DIR}/nuttx.manifest "${target}.asm\n")
|
|
endif()
|
|
endfunction(nuttx_generate_outputs)
|