From 1b9a83430956e47ebcb1eaa4156b597bb43db853 Mon Sep 17 00:00:00 2001 From: Pernilla Date: Thu, 30 Jan 2025 17:35:08 +0100 Subject: [PATCH] Updating CMakeLists --- .../actuator_effectiveness/CMakeLists.txt | 8 ++++++++ .../control_allocation/control_allocation/CMakeLists.txt | 2 +- .../VehicleActuatorEffectiveness/CMakeLists.txt | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/control_allocation/actuator_effectiveness/CMakeLists.txt b/src/lib/control_allocation/actuator_effectiveness/CMakeLists.txt index b8a3d0076d..c6ee969fdc 100644 --- a/src/lib/control_allocation/actuator_effectiveness/CMakeLists.txt +++ b/src/lib/control_allocation/actuator_effectiveness/CMakeLists.txt @@ -34,6 +34,12 @@ px4_add_library(ActuatorEffectiveness ActuatorEffectiveness.cpp ActuatorEffectiveness.hpp + ActuatorEffectivenessControlSurfaces.cpp + ActuatorEffectivenessControlSurfaces.hpp + ActuatorEffectivenessTilts.cpp + ActuatorEffectivenessTilts.hpp + ActuatorEffectivenessRotors.cpp + ActuatorEffectivenessRotors.hpp ) target_compile_options(ActuatorEffectiveness PRIVATE ${MAX_CUSTOM_OPT_LEVEL}) @@ -43,3 +49,5 @@ target_link_libraries(ActuatorEffectiveness mathlib PID ) + +px4_add_functional_gtest(SRC ActuatorEffectivenessRotorsTest.cpp LINKLIBS ActuatorEffectiveness) diff --git a/src/lib/control_allocation/control_allocation/CMakeLists.txt b/src/lib/control_allocation/control_allocation/CMakeLists.txt index d65bd11fa0..4da638aac8 100644 --- a/src/lib/control_allocation/control_allocation/CMakeLists.txt +++ b/src/lib/control_allocation/control_allocation/CMakeLists.txt @@ -44,4 +44,4 @@ target_include_directories(ControlAllocation PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(ControlAllocation PRIVATE mathlib) px4_add_unit_gtest(SRC ControlAllocationPseudoInverseTest.cpp LINKLIBS ControlAllocation) -# px4_add_functional_gtest(SRC ControlAllocationSequentialDesaturationTest.cpp LINKLIBS ControlAllocation ActuatorEffectiveness) +px4_add_functional_gtest(SRC ControlAllocationSequentialDesaturationTest.cpp LINKLIBS ControlAllocation ActuatorEffectiveness) diff --git a/src/modules/control_allocator/VehicleActuatorEffectiveness/CMakeLists.txt b/src/modules/control_allocator/VehicleActuatorEffectiveness/CMakeLists.txt index 349893a3ea..3aacebe9eb 100644 --- a/src/modules/control_allocator/VehicleActuatorEffectiveness/CMakeLists.txt +++ b/src/modules/control_allocator/VehicleActuatorEffectiveness/CMakeLists.txt @@ -1,8 +1,6 @@ px4_add_library(VehicleActuatorEffectiveness ActuatorEffectivenessUUV.cpp ActuatorEffectivenessUUV.hpp - ActuatorEffectivenessControlSurfaces.cpp - ActuatorEffectivenessControlSurfaces.hpp ActuatorEffectivenessCustom.cpp ActuatorEffectivenessCustom.hpp ActuatorEffectivenessFixedWing.cpp @@ -15,10 +13,6 @@ px4_add_library(VehicleActuatorEffectiveness ActuatorEffectivenessMCTilt.hpp ActuatorEffectivenessMultirotor.cpp ActuatorEffectivenessMultirotor.hpp - ActuatorEffectivenessTilts.cpp - ActuatorEffectivenessTilts.hpp - ActuatorEffectivenessRotors.cpp - ActuatorEffectivenessRotors.hpp ActuatorEffectivenessStandardVTOL.cpp ActuatorEffectivenessStandardVTOL.hpp ActuatorEffectivenessTiltrotorVTOL.cpp @@ -40,4 +34,3 @@ target_link_libraries(VehicleActuatorEffectiveness ) px4_add_functional_gtest(SRC ActuatorEffectivenessHelicopterTest.cpp LINKLIBS VehicleActuatorEffectiveness) -px4_add_functional_gtest(SRC ActuatorEffectivenessRotorsTest.cpp LINKLIBS VehicleActuatorEffectiveness)