fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 05:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake handle mavlink v1 submodule only where used

Browse Source
This commit is contained in:
Daniel Agar
2017-12-10 19:24:05 -05:00
parent 1886c8d983
commit 32cba41bed
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_out_rc_in/CMakeLists.txt
+4 -1
View File
@@ -31,16 +31,19 @@
# #
############################################################################ ############################################################################
include_directories(${PX4_SOURCE_DIR}/mavlink/include/mavlink) px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
px4_add_module( px4_add_module(
MODULE drivers__pwm_out_rc_in MODULE drivers__pwm_out_rc_in
MAIN pwm_out_rc_in MAIN pwm_out_rc_in
INCLUDES
${PX4_SOURCE_DIR}/mavlink/include/mavlink
COMPILE_FLAGS COMPILE_FLAGS
-DMAVLINK_COMM_NUM_BUFFERS=1 -DMAVLINK_COMM_NUM_BUFFERS=1
SRCS SRCS
pwm_out_rc_in.cpp pwm_out_rc_in.cpp
DEPENDS DEPENDS
git_mavlink_v1
platforms__common platforms__common
) )
# vim: set noet ft=cmake fenc=utf-8 ff=unix : # vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/drivers/snapdragon_rc_pwm/CMakeLists.txt
+4 -1
View File
@@ -31,16 +31,19 @@
# #
############################################################################ ############################################################################
include_directories(${PX4_SOURCE_DIR}/mavlink/include/mavlink) px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
px4_add_module( px4_add_module(
MODULE drivers__snapdragon_rc_pwm MODULE drivers__snapdragon_rc_pwm
MAIN snapdragon_rc_pwm MAIN snapdragon_rc_pwm
COMPILE_FLAGS COMPILE_FLAGS
-DMAVLINK_COMM_NUM_BUFFERS=1 -DMAVLINK_COMM_NUM_BUFFERS=1
INCLUDES
${PX4_SOURCE_DIR}/mavlink/include/mavlink
SRCS SRCS
snapdragon_rc_pwm.cpp snapdragon_rc_pwm.cpp
DEPENDS DEPENDS
git_mavlink_v1
platforms__common platforms__common
) )
# vim: set noet ft=cmake fenc=utf-8 ff=unix : # vim: set noet ft=cmake fenc=utf-8 ff=unix :
src/modules/mavlink/CMakeLists.txt
+2 -4
View File
@@ -31,8 +31,7 @@
# #
############################################################################ ############################################################################
px4_add_git_submodule(TARGET git_mavlink PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0") px4_add_git_submodule(TARGET git_mavlink_v2 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v2.0")
px4_add_git_submodule(TARGET git_mavlink2 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v2.0")
px4_add_module( px4_add_module(
MODULE modules__mavlink MODULE modules__mavlink
@@ -61,6 +60,5 @@ px4_add_module(
mavlink_ulog.cpp mavlink_ulog.cpp
DEPENDS DEPENDS
platforms__common platforms__common
git_mavlink git_mavlink_v2
git_mavlink2
) )
src/modules/simulator/CMakeLists.txt
+4 -1
View File
@@ -31,7 +31,7 @@
# #
############################################################################ ############################################################################
include_directories(${PX4_SOURCE_DIR}/mavlink/include/mavlink) px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
option(ENABLE_UART_RC_INPUT "Enable RC Input from UART mavlink connection" OFF) option(ENABLE_UART_RC_INPUT "Enable RC Input from UART mavlink connection" OFF)
@@ -59,8 +59,11 @@ px4_add_module(
MODULE modules__simulator MODULE modules__simulator
MAIN simulator MAIN simulator
COMPILE_FLAGS COMPILE_FLAGS
INCLUDES
${PX4_SOURCE_DIR}/mavlink/include/mavlink
SRCS SRCS
${SIMULATOR_SRCS} ${SIMULATOR_SRCS}
DEPENDS DEPENDS
git_mavlink_v1
platforms__common platforms__common
) )