From 584838de30038b8a48bd8a7b9a71fabec76b84d4 Mon Sep 17 00:00:00 2001 From: ChristophTobler Date: Tue, 31 Jul 2018 09:22:49 +0200 Subject: [PATCH] FlightTasks: rename libs to use CamelCase convention --- src/lib/FlightTasks/CMakeLists.txt | 27 +++++++++---------- src/lib/FlightTasks/tasks/Auto/CMakeLists.txt | 6 ++--- .../tasks/AutoFollowMe/CMakeLists.txt | 6 ++--- .../FlightTasks/tasks/AutoLine/CMakeLists.txt | 6 ++--- src/lib/FlightTasks/tasks/CMakeLists.txt | 4 ++- .../FlightTasks/tasks/Manual/CMakeLists.txt | 6 ++--- .../tasks/ManualAltitude/CMakeLists.txt | 6 ++--- .../tasks/ManualAltitudeSmooth/CMakeLists.txt | 6 ++--- .../tasks/ManualPosition/CMakeLists.txt | 6 ++--- .../tasks/ManualPositionSmooth/CMakeLists.txt | 6 ++--- .../tasks/ManualStabilized/CMakeLists.txt | 6 ++--- .../FlightTasks/tasks/Offboard/CMakeLists.txt | 6 ++--- .../FlightTasks/tasks/Orbit/CMakeLists.txt | 6 ++--- .../FlightTasks/tasks/Utility/CMakeLists.txt | 6 ++--- src/modules/mc_pos_control/CMakeLists.txt | 2 +- 15 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/lib/FlightTasks/CMakeLists.txt b/src/lib/FlightTasks/CMakeLists.txt index bcc1446793..82fffed0f5 100644 --- a/src/lib/FlightTasks/CMakeLists.txt +++ b/src/lib/FlightTasks/CMakeLists.txt @@ -31,23 +31,22 @@ # ############################################################################ -px4_add_library(flight_tasks +px4_add_library(FlightTasks FlightTasks.cpp ) -target_link_libraries(flight_tasks PUBLIC - flight_tasks_manual - flight_tasks_manual_altitude - flight_tasks_manual_altitude_smooth - flight_tasks_manual_stabilized - flight_tasks_manual_position - flight_tasks_manual_position_smooth - flight_tasks_auto - flight_tasks_auto_line - flight_tasks_auto_follow_me - flight_tasks_offboard - flight_tasks_orbit - flight_tasks_utility +target_include_directories(FlightTasks PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(FlightTasks PUBLIC + FlightTaskManual + FlightTaskManualStabilized + FlightTaskManualAltitude + FlightTaskManualAltitudeSmooth + FlightTaskManualPosition + FlightTaskManualPositionSmooth + FlightTaskAutoLine + FlightTaskAutoFollowMe + FlightTaskOffboard ) add_subdirectory(tasks) diff --git a/src/lib/FlightTasks/tasks/Auto/CMakeLists.txt b/src/lib/FlightTasks/tasks/Auto/CMakeLists.txt index 8e87379b60..7befec7fff 100644 --- a/src/lib/FlightTasks/tasks/Auto/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/Auto/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_auto +px4_add_library(FlightTaskAuto FlightTaskAuto.cpp ) -target_link_libraries(flight_tasks_auto PUBLIC flight_task) -target_include_directories(flight_tasks_auto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) +target_link_libraries(FlightTaskAuto PUBLIC FlightTask) +target_include_directories(FlightTaskAuto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) diff --git a/src/lib/FlightTasks/tasks/AutoFollowMe/CMakeLists.txt b/src/lib/FlightTasks/tasks/AutoFollowMe/CMakeLists.txt index e0b9c9fca4..2e757dc29f 100644 --- a/src/lib/FlightTasks/tasks/AutoFollowMe/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/AutoFollowMe/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_auto_follow_me +px4_add_library(FlightTaskAutoFollowMe FlightTaskAutoFollowMe.cpp ) -target_link_libraries(flight_tasks_auto_follow_me PUBLIC flight_tasks_auto) -target_include_directories(flight_tasks_auto_follow_me PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskAutoFollowMe PUBLIC FlightTaskAuto) +target_include_directories(FlightTaskAutoFollowMe PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt b/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt index 5d0f880bea..875370aa7f 100644 --- a/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_auto_line +px4_add_library(FlightTaskAutoLine FlightTaskAutoLine.cpp ) -target_link_libraries(flight_tasks_auto_line PUBLIC flight_tasks_auto) -target_include_directories(flight_tasks_auto_line PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskAutoLine PUBLIC FlightTaskAuto) +target_include_directories(FlightTaskAutoLine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/CMakeLists.txt b/src/lib/FlightTasks/tasks/CMakeLists.txt index 4e60ac0b4d..828518144e 100644 --- a/src/lib/FlightTasks/tasks/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/CMakeLists.txt @@ -31,11 +31,13 @@ # ############################################################################ -px4_add_library(flight_task +px4_add_library(FlightTask FlightTask.cpp SubscriptionArray.cpp ) +target_include_directories(FlightTask PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + add_subdirectory(Utility) add_subdirectory(Manual) add_subdirectory(ManualAltitude) diff --git a/src/lib/FlightTasks/tasks/Manual/CMakeLists.txt b/src/lib/FlightTasks/tasks/Manual/CMakeLists.txt index 6fa3006106..67883d1e66 100644 --- a/src/lib/FlightTasks/tasks/Manual/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/Manual/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual +px4_add_library(FlightTaskManual FlightTaskManual.cpp ) -target_link_libraries(flight_tasks_manual PUBLIC flight_task) -target_include_directories(flight_tasks_manual PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) +target_link_libraries(FlightTaskManual PUBLIC FlightTask) +target_include_directories(FlightTaskManual PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) diff --git a/src/lib/FlightTasks/tasks/ManualAltitude/CMakeLists.txt b/src/lib/FlightTasks/tasks/ManualAltitude/CMakeLists.txt index 833175e7f1..e3d9d82132 100644 --- a/src/lib/FlightTasks/tasks/ManualAltitude/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/ManualAltitude/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual_altitude +px4_add_library(FlightTaskManualAltitude FlightTaskManualAltitude.cpp ) -target_link_libraries(flight_tasks_manual_altitude PUBLIC flight_tasks_manual_stabilized) -target_include_directories(flight_tasks_manual_altitude PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskManualAltitude PUBLIC FlightTaskManualStabilized) +target_include_directories(FlightTaskManualAltitude PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/ManualAltitudeSmooth/CMakeLists.txt b/src/lib/FlightTasks/tasks/ManualAltitudeSmooth/CMakeLists.txt index 970afac440..30cb1f3595 100644 --- a/src/lib/FlightTasks/tasks/ManualAltitudeSmooth/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/ManualAltitudeSmooth/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual_altitude_smooth +px4_add_library(FlightTaskManualAltitudeSmooth FlightTaskManualAltitudeSmooth.cpp ) -target_link_libraries(flight_tasks_manual_altitude_smooth PUBLIC flight_tasks_manual_altitude flight_tasks_utility) -target_include_directories(flight_tasks_manual_altitude_smooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskManualAltitudeSmooth PUBLIC FlightTaskManualAltitude FlightTaskUtility) +target_include_directories(FlightTaskManualAltitudeSmooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/ManualPosition/CMakeLists.txt b/src/lib/FlightTasks/tasks/ManualPosition/CMakeLists.txt index 0e6d062112..d45486eabd 100644 --- a/src/lib/FlightTasks/tasks/ManualPosition/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/ManualPosition/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual_position +px4_add_library(FlightTaskManualPosition FlightTaskManualPosition.cpp ) -target_link_libraries(flight_tasks_manual_position PUBLIC flight_tasks_manual_altitude) -target_include_directories(flight_tasks_manual_position PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskManualPosition PUBLIC FlightTaskManualAltitude) +target_include_directories(FlightTaskManualPosition PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/ManualPositionSmooth/CMakeLists.txt b/src/lib/FlightTasks/tasks/ManualPositionSmooth/CMakeLists.txt index a55ffab31f..1b213cd827 100644 --- a/src/lib/FlightTasks/tasks/ManualPositionSmooth/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/ManualPositionSmooth/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual_position_smooth +px4_add_library(FlightTaskManualPositionSmooth FlightTaskManualPositionSmooth.cpp ) -target_link_libraries(flight_tasks_manual_position_smooth PUBLIC flight_tasks_manual_position flight_tasks_utility) -target_include_directories(flight_tasks_manual_position_smooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskManualPositionSmooth PUBLIC FlightTaskManualPosition FlightTaskUtility) +target_include_directories(FlightTaskManualPositionSmooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/ManualStabilized/CMakeLists.txt b/src/lib/FlightTasks/tasks/ManualStabilized/CMakeLists.txt index 00b8259eff..1e12883dbe 100644 --- a/src/lib/FlightTasks/tasks/ManualStabilized/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/ManualStabilized/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_manual_stabilized +px4_add_library(FlightTaskManualStabilized FlightTaskManualStabilized.cpp ) -target_link_libraries(flight_tasks_manual_stabilized PUBLIC flight_tasks_manual) -target_include_directories(flight_tasks_manual_stabilized PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskManualStabilized PUBLIC FlightTaskManual) +target_include_directories(FlightTaskManualStabilized PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/Offboard/CMakeLists.txt b/src/lib/FlightTasks/tasks/Offboard/CMakeLists.txt index baf348220b..124372d976 100644 --- a/src/lib/FlightTasks/tasks/Offboard/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/Offboard/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_offboard +px4_add_library(FlightTaskOffboard FlightTaskOffboard.cpp ) -target_link_libraries(flight_tasks_offboard PUBLIC flight_task) -target_include_directories(flight_tasks_offboard PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) +target_link_libraries(FlightTaskOffboard PUBLIC FlightTask) +target_include_directories(FlightTaskOffboard PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) diff --git a/src/lib/FlightTasks/tasks/Orbit/CMakeLists.txt b/src/lib/FlightTasks/tasks/Orbit/CMakeLists.txt index 78d9869b6e..875444dcee 100644 --- a/src/lib/FlightTasks/tasks/Orbit/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/Orbit/CMakeLists.txt @@ -31,9 +31,9 @@ # ############################################################################ -px4_add_library(flight_tasks_orbit +px4_add_library(FlightTaskOrbit FlightTaskOrbit.cpp ) -target_link_libraries(flight_tasks_orbit PUBLIC flight_tasks_manual_altitude_smooth) -target_include_directories(flight_tasks_orbit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(FlightTaskOrbit PUBLIC FlightTaskManualAltitudeSmooth) +target_include_directories(FlightTaskOrbit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/lib/FlightTasks/tasks/Utility/CMakeLists.txt b/src/lib/FlightTasks/tasks/Utility/CMakeLists.txt index c74d4edab0..9c7511309a 100644 --- a/src/lib/FlightTasks/tasks/Utility/CMakeLists.txt +++ b/src/lib/FlightTasks/tasks/Utility/CMakeLists.txt @@ -31,11 +31,11 @@ # ############################################################################ -px4_add_library(flight_tasks_utility +px4_add_library(FlightTaskUtility ManualSmoothingZ.cpp ManualSmoothingXY.cpp StraightLine.cpp ) -target_link_libraries(flight_tasks_utility PUBLIC flight_task) -target_include_directories(flight_tasks_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file +target_link_libraries(FlightTaskUtility PUBLIC FlightTask) +target_include_directories(FlightTaskUtility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/src/modules/mc_pos_control/CMakeLists.txt b/src/modules/mc_pos_control/CMakeLists.txt index dff1779782..90fdad3a79 100644 --- a/src/modules/mc_pos_control/CMakeLists.txt +++ b/src/modules/mc_pos_control/CMakeLists.txt @@ -41,7 +41,7 @@ px4_add_module( Utility/ControlMath.cpp DEPENDS controllib - flight_tasks + FlightTasks git_ecl ecl_geo ) \ No newline at end of file