Browse Source

FlightTasks: Move AutoMapper to own folder and create lib

AutoLine now depends on AutoMapper
sbg
ChristophTobler 7 years ago committed by Dennis Mannhart
parent
commit
1b1b3b5484
  1. 2
      src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt
  2. 39
      src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt
  3. 0
      src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.cpp
  4. 0
      src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.hpp
  5. 1
      src/lib/FlightTasks/tasks/CMakeLists.txt

2
src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt

@ -35,5 +35,5 @@ px4_add_library(FlightTaskAutoLine @@ -35,5 +35,5 @@ px4_add_library(FlightTaskAutoLine
FlightTaskAutoLine.cpp
)
target_link_libraries(FlightTaskAutoLine PUBLIC FlightTaskAuto)
target_link_libraries(FlightTaskAutoLine PUBLIC FlightTaskAutoMapper)
target_include_directories(FlightTaskAutoLine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

39
src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt

@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
############################################################################
#
# Copyright (c) 2018 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name PX4 nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_library(FlightTaskAutoMapper
FlightTaskAutoMapper.cpp
)
target_link_libraries(FlightTaskAutoMapper PUBLIC FlightTaskAuto)
target_include_directories(FlightTaskAutoMapper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

0
src/lib/FlightTasks/tasks/FlightTaskAutoMapper.cpp → src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.cpp

0
src/lib/FlightTasks/tasks/FlightTaskAutoMapper.hpp → src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.hpp

1
src/lib/FlightTasks/tasks/CMakeLists.txt

@ -47,6 +47,7 @@ add_subdirectory(ManualPositionSmooth) @@ -47,6 +47,7 @@ add_subdirectory(ManualPositionSmooth)
add_subdirectory(ManualStabilized)
add_subdirectory(Sport)
add_subdirectory(Auto)
add_subdirectory(AutoMapper)
add_subdirectory(AutoLine)
add_subdirectory(AutoFollowMe)
add_subdirectory(Offboard)

Loading…
Cancel
Save