From 15296ab453f164105618bb7841e776c7c1d13963 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 9 May 2022 12:20:12 -0400 Subject: [PATCH] cmake: NuttX check that CONFIG_ARCH_BOARD_CUSTOM_DIR is in PX4_BOARD_DIR --- platforms/nuttx/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt index 1f82a8adb7..d618d3ccd5 100644 --- a/platforms/nuttx/CMakeLists.txt +++ b/platforms/nuttx/CMakeLists.txt @@ -55,6 +55,16 @@ endif() # build NuttX add_subdirectory(NuttX ${PX4_BINARY_DIR}/NuttX) +# check that CONFIG_ARCH_BOARD_CUSTOM_DIR is in PX4_BOARD_DIR +if(CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH) + get_filename_component(nuttx_defconfig_root "${NUTTX_DEFCONFIG}/../.." ABSOLUTE) + get_filename_component(nuttx_config_from_defconfig "${NUTTX_DIR}/${CONFIG_ARCH_BOARD_CUSTOM_DIR}" ABSOLUTE) + + if(NOT ${nuttx_defconfig_root} MATCHES ${nuttx_config_from_defconfig}) + message(FATAL_ERROR "NuttX custom board directory (${CONFIG_ARCH_BOARD_CUSTOM_DIR}) isn't in board directory (${PX4_BOARD_DIR})") + endif() +endif() + set(nuttx_libs) set(SCRIPT_PREFIX) if("${PX4_BOARD_LABEL}" STREQUAL "bootloader")