fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-02 02:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake-2' of github.com:jgoppert/Firmware into cmake-2

Browse Source
This commit is contained in:
Lorenz Meier
2015-09-11 21:39:45 +02:00
parent e673a25344 298fbf0080
commit 5b86f3f3b3
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -97,4 +97,4 @@ upload: ;
package: ;
package_source: ;
.PHONY: clean test upload
.PHONY: clean test upload package package_source
cmake/nuttx/px4_impl_nuttx.cmake
+1
View File
@@ -111,6 +111,7 @@ function(px4_nuttx_add_firmware)
DEPENDS ${EXE}
)
endif()
add_custom_target(build_firmware ALL DEPENDS ${OUT})
endfunction()
#=============================================================================
src/firmware/nuttx/CMakeLists.txt
+6 -2
View File
@@ -27,12 +27,16 @@ target_link_libraries(firmware_nuttx
apps nuttx nosys m gcc
-Wl,--end-group)
px4_nuttx_add_firmware(OUT ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4
set(fw_file ${CMAKE_CURRENT_BINARY_DIR}/${OS}-${BOARD}-${LABEL}.px4)
px4_nuttx_add_firmware(OUT ${fw_file}
EXE ${CMAKE_CURRENT_BINARY_DIR}/firmware_nuttx
${config_firmware_options}
)
px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD}
BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4)
BUNDLE ${fw_file})
install(FILES ${fw_file} DESTINATION .)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :