Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

nuttx fix px4 builtin generation dependency

Browse Source
This commit is contained in:
Daniel Agar
2017-09-25 18:30:34 -04:00
parent e38136fc9f
commit 03784c6b01
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/NuttX/CMakeLists.txt
+4 -4
View File
@@ -93,7 +93,7 @@ add_custom_target(nuttx_context DEPENDS ${NUTTX_DIR}/include/nuttx/version.h)
add_library(nuttx_build INTERFACE) add_library(nuttx_build INTERFACE)
# builtins # builtins
add_library(nuttx_builtin INTERFACE) set(nuttx_builtin_list)
if ("${BOARD}" MATCHES "px4io") if ("${BOARD}" MATCHES "px4io")
# no apps for px4io # no apps for px4io
else() else()
@@ -109,13 +109,13 @@ else()
COMMAND echo "{ \"${MAIN}\", ${PRIORITY}, ${STACK_MAIN}, ${MAIN}_main }," > ${builtin_registry}/${MAIN}_main.bdat COMMAND echo "{ \"${MAIN}\", ${PRIORITY}, ${STACK_MAIN}, ${MAIN}_main }," > ${builtin_registry}/${MAIN}_main.bdat
VERBATIM VERBATIM
) )
add_dependencies(nuttx_builtin ${builtin_registry}/${MAIN}_main.bdat) list(APPEND nuttx_builtin_list ${builtin_registry}/${MAIN}_main.bdat)
add_custom_command(OUTPUT ${builtin_registry}/${MAIN}_main.pdat add_custom_command(OUTPUT ${builtin_registry}/${MAIN}_main.pdat
COMMAND echo "int ${MAIN}_main(int argc, char *argv[]);" > ${builtin_registry}/${MAIN}_main.pdat COMMAND echo "int ${MAIN}_main(int argc, char *argv[]);" > ${builtin_registry}/${MAIN}_main.pdat
VERBATIM VERBATIM
) )
add_dependencies(nuttx_builtin ${builtin_registry}/${MAIN}_main.pdat) list(APPEND nuttx_builtin_list ${builtin_registry}/${MAIN}_main.pdat)
endif() endif()
endforeach() endforeach()
endif() endif()
@@ -127,7 +127,7 @@ add_custom_command(OUTPUT ${APPS_DIR}/libapps.a
${APPS_DIR}/platform/.built ${APPS_DIR}/platform/.built
COMMAND find ${APPS_DIR} -name \*.o -o -name \*.built -delete COMMAND find ${APPS_DIR} -name \*.o -o -name \*.built -delete
COMMAND make --silent --no-print-directory -C ../apps TOPDIR="${NUTTX_DIR}" libapps.a > /dev/null COMMAND make --silent --no-print-directory -C ../apps TOPDIR="${NUTTX_DIR}" libapps.a > /dev/null
DEPENDS nuttx_context nuttx_builtin DEPENDS nuttx_context ${nuttx_builtin_list}
WORKING_DIRECTORY ${NUTTX_DIR} WORKING_DIRECTORY ${NUTTX_DIR}
) )
add_custom_target(nuttx_apps_build DEPENDS ${APPS_DIR}/libapps.a) add_custom_target(nuttx_apps_build DEPENDS ${APPS_DIR}/libapps.a)