mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-28 10:46:33 +08:00
RTPS and micro-CDR build system cleanup (#8084)
This commit is contained in:
@@ -545,7 +545,9 @@ endfunction()
|
||||
#
|
||||
function(px4_add_library target)
|
||||
add_library(${target} ${ARGN})
|
||||
add_dependencies(${target} prebuild_targets)
|
||||
px4_add_optimization_flags_for_target(${target})
|
||||
|
||||
# Pass variable to the parent px4_add_module.
|
||||
set(_no_optimization_for_target ${_no_optimization_for_target} PARENT_SCOPE)
|
||||
|
||||
|
||||
@@ -129,7 +129,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -89,7 +89,6 @@ set(config_module_list
|
||||
lib/DriverFramework/framework
|
||||
lib/rc
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
)
|
||||
|
||||
@@ -149,7 +149,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -96,7 +96,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -66,7 +66,6 @@ set(config_module_list
|
||||
#
|
||||
# Library modules
|
||||
#
|
||||
lib/micro-CDR
|
||||
lib/version
|
||||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
|
||||
@@ -157,7 +157,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -166,7 +166,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Platform
|
||||
|
||||
@@ -135,7 +135,6 @@ set(config_module_list
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
platforms/nuttx/px4_layer
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# OBC challenge
|
||||
|
||||
@@ -46,7 +46,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -58,7 +58,6 @@ set(config_module_list
|
||||
#
|
||||
# Library modules
|
||||
#
|
||||
lib/micro-CDR
|
||||
lib/version
|
||||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
|
||||
@@ -67,7 +67,6 @@ set(config_module_list
|
||||
#
|
||||
# Library modules
|
||||
#
|
||||
lib/micro-CDR
|
||||
lib/version
|
||||
modules/systemlib
|
||||
modules/systemlib/param
|
||||
|
||||
@@ -149,7 +149,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -145,7 +145,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -159,7 +159,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Platform
|
||||
|
||||
@@ -161,7 +161,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Platform
|
||||
|
||||
@@ -160,7 +160,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Platform
|
||||
|
||||
@@ -161,7 +161,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/terrain_estimation
|
||||
lib/version
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Platform
|
||||
|
||||
@@ -10,5 +10,4 @@ set(config_module_list
|
||||
modules/systemlib/mixer
|
||||
platforms/common
|
||||
|
||||
lib/micro-CDR
|
||||
)
|
||||
|
||||
@@ -137,7 +137,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -60,7 +60,6 @@ set(config_module_list
|
||||
modules/systemlib/param
|
||||
modules/systemlib
|
||||
lib/version
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# Libraries
|
||||
|
||||
@@ -104,7 +104,6 @@ set(config_module_list
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
platforms/nuttx
|
||||
lib/micro-CDR
|
||||
|
||||
# had to add for cmake, not sure why wasn't in original config
|
||||
platforms/common
|
||||
|
||||
@@ -87,7 +87,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# POSIX
|
||||
|
||||
@@ -48,7 +48,6 @@ set(config_module_list
|
||||
lib/conversion
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
|
||||
@@ -19,7 +19,6 @@ set(config_module_list
|
||||
modules/uORB
|
||||
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
platforms/posix/px4_layer
|
||||
platforms/posix/work_queue
|
||||
|
||||
@@ -94,7 +94,6 @@ set(config_module_list
|
||||
lib/DriverFramework/framework
|
||||
lib/rc
|
||||
lib/led
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# POSIX
|
||||
|
||||
@@ -93,7 +93,6 @@ set(config_module_list
|
||||
lib/DriverFramework/framework
|
||||
lib/rc
|
||||
lib/led
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# POSIX
|
||||
|
||||
@@ -108,7 +108,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# POSIX
|
||||
|
||||
@@ -82,7 +82,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
|
||||
@@ -74,7 +74,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
platforms/common
|
||||
platforms/posix/px4_layer
|
||||
|
||||
@@ -191,7 +191,6 @@ set(config_module_list
|
||||
examples/ekf_att_pos_estimator
|
||||
|
||||
# micro-RTPS
|
||||
lib/micro-CDR
|
||||
)
|
||||
|
||||
set(config_rtps_send_topics
|
||||
|
||||
@@ -34,11 +34,6 @@ set(config_module_list
|
||||
modules/systemlib/param
|
||||
modules/systemlib
|
||||
modules/uORB
|
||||
|
||||
#
|
||||
# Libraries
|
||||
#
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -73,7 +73,6 @@ set(config_module_list
|
||||
lib/controllib
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -45,7 +45,6 @@ set(config_module_list
|
||||
lib/conversion
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -43,7 +43,6 @@ set(config_module_list
|
||||
lib/mathlib/math/filter
|
||||
lib/conversion
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -79,7 +79,6 @@ set(config_module_list
|
||||
lib/tailsitter_recovery
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -94,7 +94,6 @@ set(config_module_list
|
||||
lib/rc
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -94,7 +94,6 @@ set(config_module_list
|
||||
lib/rc
|
||||
lib/version
|
||||
lib/DriverFramework/framework
|
||||
lib/micro-CDR
|
||||
|
||||
#
|
||||
# QuRT port
|
||||
|
||||
@@ -236,7 +236,7 @@ function(px4_os_prebuild_targets)
|
||||
REQUIRED OUT BOARD
|
||||
ARGN ${ARGN})
|
||||
|
||||
add_custom_target(${OUT} DEPENDS nuttx_context)
|
||||
add_custom_target(${OUT} DEPENDS nuttx_context uorb_headers)
|
||||
|
||||
# parse nuttx config options for cmake
|
||||
file(STRINGS ${PX4_SOURCE_DIR}/nuttx-configs/${BOARD}/nsh/defconfig ConfigContents)
|
||||
|
||||
@@ -330,5 +330,6 @@ function(px4_os_prebuild_targets)
|
||||
ONE_VALUE OUT BOARD THREADS
|
||||
REQUIRED OUT BOARD
|
||||
ARGN ${ARGN})
|
||||
add_custom_target(${OUT})
|
||||
|
||||
add_custom_target(${OUT} DEPENDS uorb_headers)
|
||||
endfunction()
|
||||
|
||||
@@ -80,6 +80,7 @@ function(px4_qurt_generate_builtin_commands)
|
||||
MULTI_VALUE MODULE_LIST
|
||||
REQUIRED MODULE_LIST OUT
|
||||
ARGN ${ARGN})
|
||||
|
||||
set(builtin_apps_string)
|
||||
set(builtin_apps_decl_string)
|
||||
set(command_count 0)
|
||||
@@ -235,7 +236,8 @@ function(px4_os_prebuild_targets)
|
||||
ONE_VALUE OUT BOARD THREADS
|
||||
REQUIRED OUT BOARD
|
||||
ARGN ${ARGN})
|
||||
add_custom_target(${OUT} DEPENDS git_driverframework)
|
||||
|
||||
add_custom_target(${OUT} DEPENDS git_driverframework uorb_headers)
|
||||
|
||||
endfunction()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user