zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cmake nuttx keep builtins generated by nuttx apps (#8323)

sbg
Daniel Agar 7 years ago committed by GitHub
parent
00a47ba542
commit
1a4f4b083c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      platforms/nuttx/NuttX/CMakeLists.txt

16
platforms/nuttx/NuttX/CMakeLists.txt
Unescape View File

@ -119,8 +119,8 @@ set(nuttx_builtin_list)
if (CONFIG_NSH_LIBRARY) if (CONFIG_NSH_LIBRARY)
# force builtins regeneration and apps rebuild if nuttx or px4 configuration have changed # force builtins regeneration and apps rebuild if nuttx or px4 configuration have changed
add_custom_command(OUTPUT builtins_clean.stamp add_custom_command(OUTPUT builtins_clean.stamp
COMMAND find ${APPS_DIR}/builtin/registry -name \*.bdat -delete COMMAND find ${APPS_DIR}/builtin/registry -name px4_\*.bdat -delete
COMMAND find ${APPS_DIR}/builtin/registry -name \*.pdat -delete COMMAND find ${APPS_DIR}/builtin/registry -name px4_\*.pdat -delete
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
@ -135,21 +135,21 @@ if (CONFIG_NSH_LIBRARY)
get_target_property(PRIORITY ${module} PRIORITY) get_target_property(PRIORITY ${module} PRIORITY)
if(MAIN) if(MAIN)
add_custom_command(OUTPUT ${APPS_DIR}/builtin/registry/${MAIN}_main.bdat add_custom_command(OUTPUT ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.bdat
COMMAND echo "{ \"${MAIN}\", ${PRIORITY}, ${STACK_MAIN}, ${MAIN}_main }," > ${APPS_DIR}/builtin/registry/${MAIN}_main.bdat COMMAND echo "{ \"${MAIN}\", ${PRIORITY}, ${STACK_MAIN}, ${MAIN}_main }," > ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.bdat
COMMAND ${CMAKE_COMMAND} -E touch ${APPS_DIR}/builtin/registry/.updated COMMAND ${CMAKE_COMMAND} -E touch ${APPS_DIR}/builtin/registry/.updated
DEPENDS nuttx_context builtins_clean.stamp DEPENDS nuttx_context builtins_clean.stamp
VERBATIM VERBATIM
) )
list(APPEND nuttx_builtin_list ${APPS_DIR}/builtin/registry/${MAIN}_main.bdat) list(APPEND nuttx_builtin_list ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.bdat)
add_custom_command(OUTPUT ${APPS_DIR}/builtin/registry/${MAIN}_main.pdat add_custom_command(OUTPUT ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.pdat
COMMAND echo "int ${MAIN}_main(int argc, char *argv[]);" > ${APPS_DIR}/builtin/registry/${MAIN}_main.pdat COMMAND echo "int ${MAIN}_main(int argc, char *argv[]);" > ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.pdat
COMMAND ${CMAKE_COMMAND} -E touch ${APPS_DIR}/builtin/registry/.updated COMMAND ${CMAKE_COMMAND} -E touch ${APPS_DIR}/builtin/registry/.updated
DEPENDS nuttx_context builtins_clean.stamp DEPENDS nuttx_context builtins_clean.stamp
VERBATIM VERBATIM
) )
list(APPEND nuttx_builtin_list ${APPS_DIR}/builtin/registry/${MAIN}_main.pdat) list(APPEND nuttx_builtin_list ${APPS_DIR}/builtin/registry/px4_${MAIN}_main.pdat)
endif() endif()
endforeach() endforeach()

Write Preview
Loading…
Cancel
Save