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

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

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	CMakeLists.txt
This commit is contained in:
Mark Charlebois 2015-09-07 21:52:33 -07:00
commit 670fee1347
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -110,7 +110,7 @@ set(package-contact "px4users@googlegroups.com")
#
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
if (EXISTS px4_imple_${OS}_${BOARD})
if (EXISTS px4_impl_${OS}_${BOARD})
include(px4_impl_${OS}_${BOARD})
else()
include(px4_impl_${OS})

10
src/CMakeLists.txt
View File

@ -61,10 +61,14 @@ if (${OS} STREQUAL "nuttx")
apps nuttx nosys m gcc
-Wl,--end-group)
px4_nuttx_add_firmware(OUT fw_main.px4 EXE main)
px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD} BUNDLE fw_main.px4)
px4_nuttx_add_firmware(OUT ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4
EXE ${CMAKE_CURRENT_BINARY_DIR}/main)
px4_nuttx_generate_romfs(OUT romfs.img ROOT ROMFS/px4fmu_common)
px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD}
BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4)
px4_nuttx_generate_romfs(OUT ${CMAKE_CURRENT_BINARY_DIR}/romfs.img
ROOT ${CMAKE_SOURCE_DIR}/ROMFS/px4fmu_common)
endif()