dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

cmake fix NuttX build dependencies

This commit is contained in:
Daniel Agar 2019-04-03 09:56:46 -04:00
parent dec96b0a3a
commit 296d7900a0
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
platforms/nuttx/NuttX/CMakeLists.txt
View File

@ -87,16 +87,22 @@ set(APPS_DIR ${CMAKE_CURRENT_BINARY_DIR}/apps)
# If the board provides a Kconfig Use it or create an empty one # If the board provides a Kconfig Use it or create an empty one
if(EXISTS ${NUTTX_CONFIG_DIR}/Kconfig) if(EXISTS ${NUTTX_CONFIG_DIR}/Kconfig)
add_custom_command( add_custom_command(
OUTPUT ${NUTTX_DIR}/configs/dummy/Kconfig OUTPUT
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_CONFIG_DIR}/Kconfig ${NUTTX_DIR}/configs/dummy/Kconfig ${NUTTX_DIR}/configs/dummy/Kconfig
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_CONFIG_DIR}/Kconfig ${NUTTX_DIR}/configs/dummy/Kconfig
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp
${CMAKE_CURRENT_BINARY_DIR}/apps_copy.stamp ${CMAKE_CURRENT_BINARY_DIR}/apps_copy.stamp
) )
else() else()
add_custom_command( add_custom_command(
OUTPUT ${NUTTX_DIR}/configs/dummy/Kconfig OUTPUT
${NUTTX_DIR}/configs/dummy/Kconfig
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
COMMAND ${CMAKE_COMMAND} -E touch ${NUTTX_DIR}/configs/dummy/Kconfig COMMAND ${CMAKE_COMMAND} -E touch ${NUTTX_DIR}/configs/dummy/Kconfig
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy.stamp
${CMAKE_CURRENT_BINARY_DIR}/apps_copy.stamp ${CMAKE_CURRENT_BINARY_DIR}/apps_copy.stamp
@ -139,25 +145,31 @@ file(STRINGS ${NUTTX_DEFCONFIG} config_expanded REGEX "# Automatically generated
if (NOT config_expanded) if (NOT config_expanded)
# copy compressed PX4 defconfig into nuttx and inflate # copy compressed PX4 defconfig into nuttx and inflate
add_custom_command( add_custom_command(
OUTPUT ${NUTTX_DIR}/.config OUTPUT
${NUTTX_DIR}/.config
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/px4_nuttx_make_olddefconfig.sh ${NUTTX_DIR} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/px4_nuttx_make_olddefconfig.sh ${NUTTX_DIR}
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
DEPENDS DEPENDS
${NUTTX_DEFCONFIG} ${NUTTX_DEFCONFIG}
${NUTTX_DIR}/configs/dummy/Kconfig
${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy_config_dir.stamp ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy_config_dir.stamp
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
WORKING_DIRECTORY ${NUTTX_DIR} WORKING_DIRECTORY ${NUTTX_DIR}
COMMENT "Copying NuttX compressed config ${NUTTX_CONFIG} and inflating" COMMENT "Copying NuttX compressed config ${NUTTX_CONFIG} and inflating"
) )
else() else()
# copy uncompressed PX4 defconfig into nuttx # copy uncompressed PX4 defconfig into nuttx
add_custom_command( add_custom_command(
OUTPUT ${NUTTX_DIR}/.config OUTPUT
${NUTTX_DIR}/.config
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_DEFCONFIG} ${NUTTX_DIR}/.config
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
DEPENDS DEPENDS
${NUTTX_DEFCONFIG} ${NUTTX_DEFCONFIG}
${NUTTX_DIR}/configs/dummy/Kconfig
${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy_config_dir.stamp ${CMAKE_CURRENT_BINARY_DIR}/nuttx_copy_config_dir.stamp
${CMAKE_CURRENT_BINARY_DIR}/nuttx_config_kconfig.stamp
WORKING_DIRECTORY ${NUTTX_DIR} WORKING_DIRECTORY ${NUTTX_DIR}
COMMENT "Copying NuttX uncompressed config ${NUTTX_CONFIG}" COMMENT "Copying NuttX uncompressed config ${NUTTX_CONFIG}"
) )
@ -190,7 +202,7 @@ endif()
# context # context
add_custom_command(OUTPUT ${NUTTX_DIR}/include/nuttx/version.h ${NUTTX_DIR}/include/nuttx/config.h add_custom_command(OUTPUT ${NUTTX_DIR}/include/nuttx/version.h ${NUTTX_DIR}/include/nuttx/config.h
COMMAND make ${nuttx_build_options} --no-print-directory CONFIG_ARCH_BOARD_CUSTOM=y context > nuttx_context.log COMMAND make ${nuttx_build_options} --no-print-directory CONFIG_ARCH_BOARD_CUSTOM=y context > nuttx_context.log
DEPENDS ${NUTTX_DIR}/.config DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
WORKING_DIRECTORY ${NUTTX_DIR} WORKING_DIRECTORY ${NUTTX_DIR}
${nuttx_build_uses_terminal} ${nuttx_build_uses_terminal}
) )
@ -210,7 +222,7 @@ if (CONFIG_NSH_LIBRARY)
COMMAND rm -f ${APPS_DIR}/builtin/builtin_list.h COMMAND rm -f ${APPS_DIR}/builtin/builtin_list.h
COMMAND ${CMAKE_COMMAND} -E touch builtins_clean.stamp COMMAND ${CMAKE_COMMAND} -E touch builtins_clean.stamp
DEPENDS DEPENDS
${NUTTX_DIR}/.config ${CMAKE_CURRENT_BINARY_DIR}/nuttx_config.stamp
${NUTTX_DIR}/include/nuttx/version.h ${NUTTX_DIR}/include/nuttx/version.h
${NUTTX_DIR}/include/nuttx/config.h ${NUTTX_DIR}/include/nuttx/config.h
${PX4_CONFIG_FILE} ${PX4_CONFIG_FILE}

2
platforms/nuttx/cmake/Toolchain-arm-none-eabi.cmake
View File

@ -33,7 +33,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# os tools # os tools
foreach(tool grep genromfs make) foreach(tool grep make)
string(TOUPPER ${tool} TOOL) string(TOUPPER ${tool} TOOL)
find_program(${TOOL} ${tool}) find_program(${TOOL} ${tool})
if(NOT ${TOOL}) if(NOT ${TOOL})