fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 04:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake: allow extra nuttx config options via PX4_EXTRA_NUTTX_CONFIG env var

Browse Source
This commit is contained in:
Beat Küng
2023-11-22 21:41:53 -05:00
committed by Daniel Agar
parent c497a25bea
commit a9c4e5a33f
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/NuttX/CMakeLists.txt
+13 -1
View File
@@ -40,11 +40,22 @@ set(APPS_DIR ${NUTTX_SRC_DIR}/apps)
configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/Make.defs.in ${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs) configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/Make.defs.in ${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs)
set(EXTRA_NUTTX_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/extra_config_options)
file(WRITE ${EXTRA_NUTTX_CONFIG_FILE} "")
if(DEFINED ENV{PX4_EXTRA_NUTTX_CONFIG})
message(STATUS "Adding extra nuttx config: $ENV{PX4_EXTRA_NUTTX_CONFIG}")
# Allow to specify extra options via 'export PX4_EXTRA_NUTTX_CONFIG="CONFIG_xy=y;CONFIG_z=y"'
foreach(OPTION $ENV{PX4_EXTRA_NUTTX_CONFIG})
file(APPEND ${EXTRA_NUTTX_CONFIG_FILE} "${OPTION}\n")
endforeach ()
endif()
# inflate .config # inflate .config
add_custom_command( add_custom_command(
OUTPUT ${NUTTX_DIR}/.config OUTPUT ${NUTTX_DIR}/.config
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs ${NUTTX_DIR}/Make.defs COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs ${NUTTX_DIR}/Make.defs
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config COMMAND cat ${NUTTX_DEFCONFIG} ${EXTRA_NUTTX_CONFIG_FILE} > ${NUTTX_DIR}/.config
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/defconfig COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/defconfig
COMMAND ${NUTTX_SRC_DIR}/tools/px4_nuttx_make_olddefconfig.sh > ${CMAKE_CURRENT_BINARY_DIR}/nuttx_olddefconfig.log COMMAND ${NUTTX_SRC_DIR}/tools/px4_nuttx_make_olddefconfig.sh > ${CMAKE_CURRENT_BINARY_DIR}/nuttx_olddefconfig.log
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DIR}/.config ${CMAKE_CURRENT_BINARY_DIR}/nuttx/.config COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DIR}/.config ${CMAKE_CURRENT_BINARY_DIR}/nuttx/.config
@@ -52,6 +63,7 @@ add_custom_command(
${NUTTX_DEFCONFIG} ${NUTTX_DEFCONFIG}
${NUTTX_DIR}/defconfig ${NUTTX_DIR}/defconfig
${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs ${CMAKE_CURRENT_BINARY_DIR}/nuttx/Make.defs
${CMAKE_CURRENT_BINARY_DIR}/../defconfig_inflate_stamp
WORKING_DIRECTORY ${NUTTX_DIR} WORKING_DIRECTORY ${NUTTX_DIR}
#USES_TERMINAL #USES_TERMINAL
) )
platforms/nuttx/cmake/init.cmake
+4
View File
@@ -77,6 +77,10 @@ execute_process(
OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/nuttx_olddefconfig.log OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/nuttx_olddefconfig.log
RESULT_VARIABLE ret RESULT_VARIABLE ret
) )
execute_process(
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/defconfig_inflate_stamp
WORKING_DIRECTORY ${NUTTX_DIR}
)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DIR}/.config ${PX4_BINARY_DIR}/NuttX/nuttx/.config) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DIR}/.config ${PX4_BINARY_DIR}/NuttX/nuttx/.config)
############################################################################### ###############################################################################