mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-15 23:33:34 +08:00
cmake remove circular linking and reorganize
- px4_add_module now requires MAIN - px4_add_library doesn't automatically link
This commit is contained in:
@@ -77,9 +77,8 @@ px4_add_module(
|
||||
indication_controller.cpp
|
||||
led.cpp
|
||||
uavcanesc_params.c
|
||||
${PX4_SOURCE_DIR}/src/modules/systemlib/flashparams/flashparams.c
|
||||
${PX4_SOURCE_DIR}/src/modules/systemlib/flashparams/flashfs.c
|
||||
DEPENDS
|
||||
drivers_bootloaders
|
||||
git_uavcan
|
||||
|
||||
# within libuavcan
|
||||
@@ -87,5 +86,3 @@ px4_add_module(
|
||||
uavcan
|
||||
uavcan_stm32_driver
|
||||
)
|
||||
|
||||
target_link_libraries(modules__uavcanesc uavcan uavcan_stm32_driver)
|
||||
|
||||
@@ -42,7 +42,6 @@ px4_add_module(
|
||||
esc_cfg.cpp
|
||||
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -42,7 +42,6 @@ px4_add_module(
|
||||
esc_dc.cpp
|
||||
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -42,7 +42,6 @@ px4_add_module(
|
||||
esc_rpm.cpp
|
||||
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -42,7 +42,6 @@ px4_add_module(
|
||||
esc_selftest.cpp
|
||||
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -41,7 +41,6 @@ px4_add_module(
|
||||
SRCS
|
||||
esc_stat.cpp
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -41,7 +41,6 @@ px4_add_module(
|
||||
nshterm.c
|
||||
PRIORITY "SCHED_PRIORITY_DEFAULT-30"
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
|
||||
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
#
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <systemlib/err.h>
|
||||
#include <systemlib/systemlib.h>
|
||||
#include <systemlib/param/param.h>
|
||||
#include <parameters/param.h>
|
||||
#include <lib/mixer/mixer.h>
|
||||
#include <systemlib/board_serial.h>
|
||||
#include <version/version.h>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
*/
|
||||
|
||||
#include <px4_config.h>
|
||||
#include <systemlib/param/param.h>
|
||||
#include <parameters/param.h>
|
||||
|
||||
/**
|
||||
* UAVCAN Node ID.
|
||||
|
||||
Reference in New Issue
Block a user