mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 13:13:34 +08:00
NuttX upgrade cmake wrapper (#7873)
* NuttX cmake * px4_macros:Pass the stringified predicate as second arg to static assert CC_ASSERT mapes to the c++ static_assert or provides the same funtionality for c via the other macros. The c++ static assert takes 2 argumants the prdicate and a message. This fixes the lacking second argument. * Updated nuttx and apps submodule to upstream nuttx 7.21+==master This is the latest uptake of upstream nuttx and apps. * ROMFS generate with xxd instead of objcopy * delete nuttx-patches * NuttX update submodules to latest px4_nuttx-master * fix nuttx apps and board dependency * docker_run update to latest container 2017-08-29 * cmake ROMFS portable sed usage * NuttX update submodules to latest px4_nuttx-master
This commit is contained in:
@@ -39,13 +39,15 @@ list(APPEND SRCS
|
||||
)
|
||||
|
||||
if(${OS} STREQUAL "nuttx")
|
||||
if (NOT ${BOARD} STREQUAL "sim")
|
||||
list(APPEND SRCS
|
||||
device_nuttx.cpp
|
||||
cdev.cpp
|
||||
i2c_nuttx.cpp
|
||||
spi.cpp
|
||||
)
|
||||
list(APPEND SRCS
|
||||
device_nuttx.cpp
|
||||
cdev.cpp
|
||||
)
|
||||
if ("${CONFIG_I2C}" STREQUAL "y")
|
||||
list(APPEND SRCS i2c_nuttx.cpp)
|
||||
endif()
|
||||
if ("${CONFIG_SPI}" STREQUAL "y")
|
||||
list(APPEND SRCS spi.cpp)
|
||||
endif()
|
||||
else()
|
||||
list(APPEND SRCS
|
||||
@@ -56,6 +58,7 @@ else()
|
||||
i2c_posix.cpp
|
||||
sim.cpp
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
px4_add_module(
|
||||
@@ -63,5 +66,4 @@ px4_add_module(
|
||||
SRCS ${SRCS}
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
)
|
||||
Reference in New Issue
Block a user