More config cleanup.

This commit is contained in:
James Goppert
2015-09-11 00:15:33 -04:00
parent ec209f13f0
commit 0e8cc821a9
3 changed files with 14 additions and 12 deletions

View File

@@ -86,10 +86,10 @@ function(px4_nuttx_add_firmware)
#TODO handle param_xml
if(PARAM_XML)
add_custom_command(OUTPUT ${OUT}
COMMAND ${process_params}
COMMAND ${PYTHON_EXECUTABLE} ${process_params}
--src-path ${CMAKE_SOURCE_DIR}/src
--board CONFIG_ARCH_BOARD_${BOARD} --xml
COMMAND ${process_airframes}
COMMAND ${PYTHON_EXECUTABLE} ${process_airframes}
-a ${CMAKE_SOURCE_DIR}/ROMFS/px4fmu_common/init.d
--board CONFIG_ARCH_BOARD_${BOARD} --xml
COMMAND ${OBJCOPY} -O binary ${EXE} ${EXE}.bin
@@ -97,10 +97,9 @@ function(px4_nuttx_add_firmware)
--prototype ${CMAKE_SOURCE_DIR}/Images/${BOARD}.prototype
--git_identity ${CMAKE_SOURCE_DIR}
--parameter_xml parameters.xml
--airframe_xml airframe.xml
--airframe_xml airframes.xml
--image ${EXE}.bin > ${OUT}
DEPENDS ${EXE}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
else()
add_custom_command(OUTPUT ${OUT}
@@ -110,7 +109,6 @@ function(px4_nuttx_add_firmware)
--git_identity ${CMAKE_SOURCE_DIR}
--image ${EXE}.bin > ${OUT}
DEPENDS ${EXE}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
endif()
endfunction()