Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to support standalone ECL build inclusion #9406

Merged
merged 1 commit into from
May 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/drivers/vmount/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ px4_add_module(
output_rc.cpp
vmount.cpp
DEPENDS
git_ecl
ecl_geo
)

2 changes: 2 additions & 0 deletions src/examples/bottle_drop/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ px4_add_module(
SRCS
bottle_drop.cpp
DEPENDS
git_ecl
ecl_geo
)

2 changes: 1 addition & 1 deletion src/lib/ecl
Submodule ecl updated from eec71d to 372f9f
2 changes: 2 additions & 0 deletions src/modules/attitude_estimator_q/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@ px4_add_module(
SRCS
attitude_estimator_q_main.cpp
DEPENDS
git_ecl
ecl_geo_lookup
)

5 changes: 2 additions & 3 deletions src/modules/ekf2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ px4_add_module(
-Wno-sign-compare # TODO: fix all sign-compare
STACK_MAIN 2500
STACK_MAX 4000
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
ekf2_main.cpp
DEPENDS
git_ecl
ecl
ecl_EKF
ecl_geo
)
2 changes: 1 addition & 1 deletion src/modules/fw_att_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ px4_add_module(
FixedwingAttitudeControl.cpp
DEPENDS
git_ecl
ecl
ecl_attitude_fw
)
5 changes: 2 additions & 3 deletions src/modules/fw_pos_control_l1/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,13 @@ px4_add_module(
MODULE modules__fw_pos_control_l1
MAIN fw_pos_control_l1
STACK_MAIN 1200
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
FixedwingPositionControl.cpp
Landingslope.cpp
DEPENDS
git_ecl
ecl
ecl_l1
ecl_tecs
launchdetection
runway_takeoff
)
2 changes: 0 additions & 2 deletions src/modules/gnd_att_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,4 @@ px4_add_module(
SRCS
GroundRoverAttitudeControl.cpp
DEPENDS
git_ecl
ecl
)
6 changes: 1 addition & 5 deletions src/modules/gnd_pos_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,9 @@
px4_add_module(
MODULE modules__gnd_pos_control
MAIN gnd_pos_control
STACK_MAIN 1200
COMPILE_FLAGS
INCLUDES
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
GroundRoverPositionControl.cpp
DEPENDS
git_ecl
ecl
ecl_l1
)
2 changes: 2 additions & 0 deletions src/modules/local_position_estimator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@ px4_add_module(
sensors/landing_target.cpp
DEPENDS
controllib
git_ecl
ecl_geo
)
2 changes: 2 additions & 0 deletions src/modules/mavlink/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,6 @@ px4_add_module(
DEPENDS
git_mavlink_v2
conversion
git_ecl
ecl_geo
)
2 changes: 1 addition & 1 deletion src/modules/mc_pos_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ px4_add_module(
controllib
flight_tasks
git_ecl
ecl
ecl_geo
)
2 changes: 1 addition & 1 deletion src/modules/navigator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ px4_add_module(
follow_target.cpp
DEPENDS
git_ecl
ecl
ecl_geo
)
2 changes: 2 additions & 0 deletions src/modules/position_estimator_inav/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,6 @@ px4_add_module(
inertial_filter.cpp
DEPENDS
terrain_estimation
git_ecl
ecl_geo
)
2 changes: 1 addition & 1 deletion src/modules/sensors/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ px4_add_module(
drivers__device
battery
git_ecl
ecl
ecl_validation
)
2 changes: 2 additions & 0 deletions src/modules/simulator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ px4_add_module(
battery
conversion
drivers__ledsim
git_ecl
ecl_geo
)
target_include_directories(modules__simulator INTERFACE ${PX4_SOURCE_DIR}/mavlink/include/mavlink)

Expand Down
3 changes: 3 additions & 0 deletions src/modules/wind_estimator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ px4_add_module(
${PX4_SOURCE_DIR}/src/lib/ecl
SRCS
wind_estimator_main.cpp
DEPENDS
git_ecl
ecl_airdata
)
2 changes: 1 addition & 1 deletion src/systemcmds/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ px4_add_module(
DEPENDS
modules__mc_pos_control__mc_pos_control_tests
git_ecl
ecl
ecl_geo_lookup # TODO: move this
)