FlightTasks: rename libs to use CamelCase convention

This commit is contained in:
ChristophTobler
2018-08-08 13:44:49 +02:00
committed by Dennis Mannhart
parent b68fd5e0a7
commit 584838de30
15 changed files with 53 additions and 52 deletions
+13 -14
View File
@@ -31,23 +31,22 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks px4_add_library(FlightTasks
FlightTasks.cpp FlightTasks.cpp
) )
target_link_libraries(flight_tasks PUBLIC target_include_directories(FlightTasks PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
flight_tasks_manual
flight_tasks_manual_altitude target_link_libraries(FlightTasks PUBLIC
flight_tasks_manual_altitude_smooth FlightTaskManual
flight_tasks_manual_stabilized FlightTaskManualStabilized
flight_tasks_manual_position FlightTaskManualAltitude
flight_tasks_manual_position_smooth FlightTaskManualAltitudeSmooth
flight_tasks_auto FlightTaskManualPosition
flight_tasks_auto_line FlightTaskManualPositionSmooth
flight_tasks_auto_follow_me FlightTaskAutoLine
flight_tasks_offboard FlightTaskAutoFollowMe
flight_tasks_orbit FlightTaskOffboard
flight_tasks_utility
) )
add_subdirectory(tasks) add_subdirectory(tasks)
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_auto px4_add_library(FlightTaskAuto
FlightTaskAuto.cpp FlightTaskAuto.cpp
) )
target_link_libraries(flight_tasks_auto PUBLIC flight_task) target_link_libraries(FlightTaskAuto PUBLIC FlightTask)
target_include_directories(flight_tasks_auto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) target_include_directories(FlightTaskAuto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../)
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_auto_follow_me px4_add_library(FlightTaskAutoFollowMe
FlightTaskAutoFollowMe.cpp FlightTaskAutoFollowMe.cpp
) )
target_link_libraries(flight_tasks_auto_follow_me PUBLIC flight_tasks_auto) target_link_libraries(FlightTaskAutoFollowMe PUBLIC FlightTaskAuto)
target_include_directories(flight_tasks_auto_follow_me PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskAutoFollowMe PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_auto_line px4_add_library(FlightTaskAutoLine
FlightTaskAutoLine.cpp FlightTaskAutoLine.cpp
) )
target_link_libraries(flight_tasks_auto_line PUBLIC flight_tasks_auto) target_link_libraries(FlightTaskAutoLine PUBLIC FlightTaskAuto)
target_include_directories(flight_tasks_auto_line PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskAutoLine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+3 -1
View File
@@ -31,11 +31,13 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_task px4_add_library(FlightTask
FlightTask.cpp FlightTask.cpp
SubscriptionArray.cpp SubscriptionArray.cpp
) )
target_include_directories(FlightTask PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(Utility) add_subdirectory(Utility)
add_subdirectory(Manual) add_subdirectory(Manual)
add_subdirectory(ManualAltitude) add_subdirectory(ManualAltitude)
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual px4_add_library(FlightTaskManual
FlightTaskManual.cpp FlightTaskManual.cpp
) )
target_link_libraries(flight_tasks_manual PUBLIC flight_task) target_link_libraries(FlightTaskManual PUBLIC FlightTask)
target_include_directories(flight_tasks_manual PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) target_include_directories(FlightTaskManual PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../)
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual_altitude px4_add_library(FlightTaskManualAltitude
FlightTaskManualAltitude.cpp FlightTaskManualAltitude.cpp
) )
target_link_libraries(flight_tasks_manual_altitude PUBLIC flight_tasks_manual_stabilized) target_link_libraries(FlightTaskManualAltitude PUBLIC FlightTaskManualStabilized)
target_include_directories(flight_tasks_manual_altitude PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskManualAltitude PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual_altitude_smooth px4_add_library(FlightTaskManualAltitudeSmooth
FlightTaskManualAltitudeSmooth.cpp FlightTaskManualAltitudeSmooth.cpp
) )
target_link_libraries(flight_tasks_manual_altitude_smooth PUBLIC flight_tasks_manual_altitude flight_tasks_utility) target_link_libraries(FlightTaskManualAltitudeSmooth PUBLIC FlightTaskManualAltitude FlightTaskUtility)
target_include_directories(flight_tasks_manual_altitude_smooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskManualAltitudeSmooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual_position px4_add_library(FlightTaskManualPosition
FlightTaskManualPosition.cpp FlightTaskManualPosition.cpp
) )
target_link_libraries(flight_tasks_manual_position PUBLIC flight_tasks_manual_altitude) target_link_libraries(FlightTaskManualPosition PUBLIC FlightTaskManualAltitude)
target_include_directories(flight_tasks_manual_position PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskManualPosition PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual_position_smooth px4_add_library(FlightTaskManualPositionSmooth
FlightTaskManualPositionSmooth.cpp FlightTaskManualPositionSmooth.cpp
) )
target_link_libraries(flight_tasks_manual_position_smooth PUBLIC flight_tasks_manual_position flight_tasks_utility) target_link_libraries(FlightTaskManualPositionSmooth PUBLIC FlightTaskManualPosition FlightTaskUtility)
target_include_directories(flight_tasks_manual_position_smooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskManualPositionSmooth PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_manual_stabilized px4_add_library(FlightTaskManualStabilized
FlightTaskManualStabilized.cpp FlightTaskManualStabilized.cpp
) )
target_link_libraries(flight_tasks_manual_stabilized PUBLIC flight_tasks_manual) target_link_libraries(FlightTaskManualStabilized PUBLIC FlightTaskManual)
target_include_directories(flight_tasks_manual_stabilized PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskManualStabilized PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_offboard px4_add_library(FlightTaskOffboard
FlightTaskOffboard.cpp FlightTaskOffboard.cpp
) )
target_link_libraries(flight_tasks_offboard PUBLIC flight_task) target_link_libraries(FlightTaskOffboard PUBLIC FlightTask)
target_include_directories(flight_tasks_offboard PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../) target_include_directories(FlightTaskOffboard PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ../)
@@ -31,9 +31,9 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_orbit px4_add_library(FlightTaskOrbit
FlightTaskOrbit.cpp FlightTaskOrbit.cpp
) )
target_link_libraries(flight_tasks_orbit PUBLIC flight_tasks_manual_altitude_smooth) target_link_libraries(FlightTaskOrbit PUBLIC FlightTaskManualAltitudeSmooth)
target_include_directories(flight_tasks_orbit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskOrbit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,11 +31,11 @@
# #
############################################################################ ############################################################################
px4_add_library(flight_tasks_utility px4_add_library(FlightTaskUtility
ManualSmoothingZ.cpp ManualSmoothingZ.cpp
ManualSmoothingXY.cpp ManualSmoothingXY.cpp
StraightLine.cpp StraightLine.cpp
) )
target_link_libraries(flight_tasks_utility PUBLIC flight_task) target_link_libraries(FlightTaskUtility PUBLIC FlightTask)
target_include_directories(flight_tasks_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(FlightTaskUtility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+1 -1
View File
@@ -41,7 +41,7 @@ px4_add_module(
Utility/ControlMath.cpp Utility/ControlMath.cpp
DEPENDS DEPENDS
controllib controllib
flight_tasks FlightTasks
git_ecl git_ecl
ecl_geo ecl_geo
) )