mirror of
https://github.com/apache/nuttx.git
synced 2026-08-20 13:08:26 +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>
81 lines
2.8 KiB
CMake
81 lines
2.8 KiB
CMake
# ##############################################################################
|
|
# openamp/libmetal.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.
|
|
#
|
|
# ##############################################################################
|
|
if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libmetal)
|
|
FetchContent_Declare(
|
|
libmetal
|
|
DOWNLOAD_NAME "libmetal-main.zip"
|
|
DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
|
|
URL "https://github.com/OpenAMP/libmetal/archive/v${LIBMETAL_VERSION}.zip"
|
|
SOURCE_DIR
|
|
${CMAKE_CURRENT_LIST_DIR}/libmetal
|
|
BINARY_DIR
|
|
${NUTTX_BINARY_DIR}/openamp/libmetal
|
|
CONFIGURE_COMMAND
|
|
""
|
|
BUILD_COMMAND
|
|
""
|
|
INSTALL_COMMAND
|
|
""
|
|
PATCH_COMMAND
|
|
patch -p0 -d ${CMAKE_CURRENT_LIST_DIR} <
|
|
${CMAKE_CURRENT_LIST_DIR}/0001-libmetal-cmake-set-HAVE_STDATOMIC_H-default-true-in-.patch
|
|
&& patch -p0 -d ${CMAKE_CURRENT_LIST_DIR} <
|
|
${CMAKE_CURRENT_LIST_DIR}/0002-libmetal-atomic-enable-64-bit-atomic-by-toolchain-bu.patch
|
|
&& patch -p0 -d ${CMAKE_CURRENT_LIST_DIR} <
|
|
${CMAKE_CURRENT_LIST_DIR}/0003-mutex-change-the-libmetal-nuttx-mutex-to-recursive-m.patch
|
|
DOWNLOAD_NO_PROGRESS true
|
|
TIMEOUT 30)
|
|
|
|
FetchContent_GetProperties(libmetal)
|
|
|
|
if(NOT libmetal_target_POPULATED)
|
|
FetchContent_Populate(libmetal)
|
|
endif()
|
|
endif()
|
|
|
|
if("${CONFIG_ARCH}" STREQUAL "sim")
|
|
set(LIBMETAL_ARCH x86_64)
|
|
elseif("${CONFIG_ARCH}" STREQUAL "risc-v")
|
|
set(LIBMETAL_ARCH riscv)
|
|
elseif("${CONFIG_ARCH}" STREQUAL "arm64")
|
|
set(LIBMETAL_ARCH aarch64)
|
|
else()
|
|
set(LIBMETAL_ARCH ${CONFIG_ARCH})
|
|
endif()
|
|
|
|
set(PROJECT_SYSTEM nuttx)
|
|
set(CMAKE_SYSTEM_PROCESSOR ${LIBMETAL_ARCH})
|
|
set(MACHINE ${CONFIG_ARCH})
|
|
set(CMAKE_SYSTEM_NAME NuttX)
|
|
set(WITH_DOC OFF)
|
|
|
|
if(CONFIG_OPENAMP_CACHE)
|
|
add_compile_definitions(METAL_CACHE)
|
|
endif()
|
|
|
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libmetal
|
|
${CMAKE_CURRENT_BINARY_DIR}/libmetal EXCLUDE_FROM_ALL)
|
|
|
|
nuttx_create_symlink(${CMAKE_CURRENT_BINARY_DIR}/libmetal/lib/include/metal
|
|
${NUTTX_BINARY_DIR}/include/metal)
|
|
|
|
nuttx_add_external_library(metal-static MODE KERNEL)
|