mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-17 05:13:35 +08:00
cmake: Fixes for qurt and nuttx
Added px4_parameters.c to nuttx executable src list. Minor syntax fix in Tools/px_generate_params.py for semicolon. Added handling of PX4_MAIN which was not yet supoprted in the cmake build. Fixed include quotes in muorb_test_example.cpp Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
@@ -11,7 +11,7 @@ px4_nuttx_generate_romfs(OUT romfs.o
|
||||
px4_generate_parameters()
|
||||
|
||||
# add executable
|
||||
add_executable(firmware_nuttx builtin_commands.c romfs.o)
|
||||
add_executable(firmware_nuttx builtin_commands.c ${CMAKE_BINARY_DIR}/px4_parameters.c romfs.o)
|
||||
set(nuttx_export_dir ${CMAKE_BINARY_DIR}/${BOARD}/NuttX/nuttx-export)
|
||||
set(main_link_flags
|
||||
"-T${nuttx_export_dir}/build/ld.script"
|
||||
|
||||
@@ -20,10 +20,12 @@ px4_generate_parameters()
|
||||
if ("${QURT_ENABLE_STUBS}" STREQUAL "1")
|
||||
add_executable(mainapp
|
||||
${CMAKE_SOURCE_DIR}/src/platforms/qurt/dspal/dspal_stub.c
|
||||
${CMAKE_BINARY_DIR}/px4_parameters.c
|
||||
${CMAKE_BINARY_DIR}/apps.h)
|
||||
else("${QURT_ENABLE_STUBS}" STREQUAL "1")
|
||||
add_library(mainapp
|
||||
${CMAKE_SOURCE_DIR}/src/platforms/qurt/dspal/dspal_stub.c
|
||||
${CMAKE_BINARY_DIR}/px4_parameters.c
|
||||
${CMAKE_BINARY_DIR}/apps.h)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <string.h>
|
||||
#include "uORB/topics/sensor_combined.h"
|
||||
#include "uORB/topics/pwm_input.h"
|
||||
#include "uORB.h"
|
||||
#include "modules/uORB/uORB.h"
|
||||
#include "px4_middleware.h"
|
||||
#include "px4_defines.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
Reference in New Issue
Block a user