diff --git a/src/drivers/vmount/CMakeLists.txt b/src/drivers/vmount/CMakeLists.txt index cbb1b054efc8..21fa3d7adc5e 100644 --- a/src/drivers/vmount/CMakeLists.txt +++ b/src/drivers/vmount/CMakeLists.txt @@ -46,5 +46,7 @@ px4_add_module( output_rc.cpp vmount.cpp DEPENDS + git_ecl + ecl_geo ) diff --git a/src/examples/bottle_drop/CMakeLists.txt b/src/examples/bottle_drop/CMakeLists.txt index 5fbffb57e649..7b0fc64cd672 100644 --- a/src/examples/bottle_drop/CMakeLists.txt +++ b/src/examples/bottle_drop/CMakeLists.txt @@ -38,5 +38,7 @@ px4_add_module( SRCS bottle_drop.cpp DEPENDS + git_ecl + ecl_geo ) diff --git a/src/lib/ecl b/src/lib/ecl index eec71d1a1067..67756696cdf7 160000 --- a/src/lib/ecl +++ b/src/lib/ecl @@ -1 +1 @@ -Subproject commit eec71d1a10679968da38a64724cba55a8bd47182 +Subproject commit 67756696cdf7be0495179a45fc0991031ade1c10 diff --git a/src/modules/attitude_estimator_q/CMakeLists.txt b/src/modules/attitude_estimator_q/CMakeLists.txt index 188c481ead39..09c8fc7e2c01 100644 --- a/src/modules/attitude_estimator_q/CMakeLists.txt +++ b/src/modules/attitude_estimator_q/CMakeLists.txt @@ -40,5 +40,7 @@ px4_add_module( SRCS attitude_estimator_q_main.cpp DEPENDS + git_ecl + ecl_geo_lookup ) diff --git a/src/modules/ekf2/CMakeLists.txt b/src/modules/ekf2/CMakeLists.txt index bea7c1573d75..6818295803cf 100644 --- a/src/modules/ekf2/CMakeLists.txt +++ b/src/modules/ekf2/CMakeLists.txt @@ -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 ) diff --git a/src/modules/fw_att_control/CMakeLists.txt b/src/modules/fw_att_control/CMakeLists.txt index da0d301af4ff..53eed2886a2a 100644 --- a/src/modules/fw_att_control/CMakeLists.txt +++ b/src/modules/fw_att_control/CMakeLists.txt @@ -37,5 +37,5 @@ px4_add_module( FixedwingAttitudeControl.cpp DEPENDS git_ecl - ecl + ecl_attitude_fw ) diff --git a/src/modules/fw_pos_control_l1/CMakeLists.txt b/src/modules/fw_pos_control_l1/CMakeLists.txt index 6b7f1e3fd0b5..210863e39479 100644 --- a/src/modules/fw_pos_control_l1/CMakeLists.txt +++ b/src/modules/fw_pos_control_l1/CMakeLists.txt @@ -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 ) diff --git a/src/modules/gnd_att_control/CMakeLists.txt b/src/modules/gnd_att_control/CMakeLists.txt index 54bdb2b5b59a..46c0ea8d7c42 100644 --- a/src/modules/gnd_att_control/CMakeLists.txt +++ b/src/modules/gnd_att_control/CMakeLists.txt @@ -38,6 +38,4 @@ px4_add_module( SRCS GroundRoverAttitudeControl.cpp DEPENDS - git_ecl - ecl ) diff --git a/src/modules/gnd_pos_control/CMakeLists.txt b/src/modules/gnd_pos_control/CMakeLists.txt index fda35ebebf44..7e5afec80d71 100644 --- a/src/modules/gnd_pos_control/CMakeLists.txt +++ b/src/modules/gnd_pos_control/CMakeLists.txt @@ -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 ) diff --git a/src/modules/local_position_estimator/CMakeLists.txt b/src/modules/local_position_estimator/CMakeLists.txt index 6c27bde13a70..276ce6be2029 100644 --- a/src/modules/local_position_estimator/CMakeLists.txt +++ b/src/modules/local_position_estimator/CMakeLists.txt @@ -51,4 +51,6 @@ px4_add_module( sensors/landing_target.cpp DEPENDS controllib + git_ecl + ecl_geo ) diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt index ad203e6f3c09..c9f612d8ffa0 100644 --- a/src/modules/mavlink/CMakeLists.txt +++ b/src/modules/mavlink/CMakeLists.txt @@ -64,4 +64,6 @@ px4_add_module( DEPENDS git_mavlink_v2 conversion + git_ecl + ecl_geo ) diff --git a/src/modules/mc_pos_control/CMakeLists.txt b/src/modules/mc_pos_control/CMakeLists.txt index f8e4bfb61246..dff1779782ff 100644 --- a/src/modules/mc_pos_control/CMakeLists.txt +++ b/src/modules/mc_pos_control/CMakeLists.txt @@ -43,5 +43,5 @@ px4_add_module( controllib flight_tasks git_ecl - ecl + ecl_geo ) \ No newline at end of file diff --git a/src/modules/navigator/CMakeLists.txt b/src/modules/navigator/CMakeLists.txt index 4344f5f826ee..ce79d1cb66ac 100644 --- a/src/modules/navigator/CMakeLists.txt +++ b/src/modules/navigator/CMakeLists.txt @@ -55,5 +55,5 @@ px4_add_module( follow_target.cpp DEPENDS git_ecl - ecl + ecl_geo ) diff --git a/src/modules/position_estimator_inav/CMakeLists.txt b/src/modules/position_estimator_inav/CMakeLists.txt index 91fd1416a000..4311ccd05d13 100644 --- a/src/modules/position_estimator_inav/CMakeLists.txt +++ b/src/modules/position_estimator_inav/CMakeLists.txt @@ -42,4 +42,6 @@ px4_add_module( inertial_filter.cpp DEPENDS terrain_estimation + git_ecl + ecl_geo ) diff --git a/src/modules/sensors/CMakeLists.txt b/src/modules/sensors/CMakeLists.txt index 30b6572ff5d5..e2d089860873 100644 --- a/src/modules/sensors/CMakeLists.txt +++ b/src/modules/sensors/CMakeLists.txt @@ -49,5 +49,5 @@ px4_add_module( drivers__device battery git_ecl - ecl + ecl_validation ) diff --git a/src/modules/simulator/CMakeLists.txt b/src/modules/simulator/CMakeLists.txt index 610eebff12b9..beeb96583b38 100644 --- a/src/modules/simulator/CMakeLists.txt +++ b/src/modules/simulator/CMakeLists.txt @@ -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) diff --git a/src/modules/wind_estimator/CMakeLists.txt b/src/modules/wind_estimator/CMakeLists.txt index 597f629db8b0..3f6bff2d4f2b 100644 --- a/src/modules/wind_estimator/CMakeLists.txt +++ b/src/modules/wind_estimator/CMakeLists.txt @@ -37,4 +37,7 @@ px4_add_module( ${PX4_SOURCE_DIR}/src/lib/ecl SRCS wind_estimator_main.cpp + DEPENDS + git_ecl + ecl_airdata ) diff --git a/src/systemcmds/tests/CMakeLists.txt b/src/systemcmds/tests/CMakeLists.txt index f6e00007682f..ba196381f643 100644 --- a/src/systemcmds/tests/CMakeLists.txt +++ b/src/systemcmds/tests/CMakeLists.txt @@ -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 )