From 1b1b3b5484ab08f5db0009b1b5dbc3ec3ca80c10 Mon Sep 17 00:00:00 2001
From: ChristophTobler <christoph@px4.io>
Date: Thu, 2 Aug 2018 15:07:58 +0200
Subject: [PATCH] FlightTasks: Move AutoMapper to own folder and create lib

AutoLine now depends on AutoMapper
---
 .../FlightTasks/tasks/AutoLine/CMakeLists.txt |  2 +-
 .../tasks/AutoMapper/CMakeLists.txt           | 39 +++++++++++++++++++
 .../{ => AutoMapper}/FlightTaskAutoMapper.cpp |  0
 .../{ => AutoMapper}/FlightTaskAutoMapper.hpp |  0
 src/lib/FlightTasks/tasks/CMakeLists.txt      |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt
 rename src/lib/FlightTasks/tasks/{ => AutoMapper}/FlightTaskAutoMapper.cpp (100%)
 rename src/lib/FlightTasks/tasks/{ => AutoMapper}/FlightTaskAutoMapper.hpp (100%)

diff --git a/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt b/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt
index 875370aa7f..1621847504 100644
--- a/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt
+++ b/src/lib/FlightTasks/tasks/AutoLine/CMakeLists.txt
@@ -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})
diff --git a/src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt b/src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt
new file mode 100644
index 0000000000..28d05f051d
--- /dev/null
+++ b/src/lib/FlightTasks/tasks/AutoMapper/CMakeLists.txt
@@ -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})
diff --git a/src/lib/FlightTasks/tasks/FlightTaskAutoMapper.cpp b/src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.cpp
similarity index 100%
rename from src/lib/FlightTasks/tasks/FlightTaskAutoMapper.cpp
rename to src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.cpp
diff --git a/src/lib/FlightTasks/tasks/FlightTaskAutoMapper.hpp b/src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.hpp
similarity index 100%
rename from src/lib/FlightTasks/tasks/FlightTaskAutoMapper.hpp
rename to src/lib/FlightTasks/tasks/AutoMapper/FlightTaskAutoMapper.hpp
diff --git a/src/lib/FlightTasks/tasks/CMakeLists.txt b/src/lib/FlightTasks/tasks/CMakeLists.txt
index d90dc965ce..ec5540d6b2 100644
--- a/src/lib/FlightTasks/tasks/CMakeLists.txt
+++ b/src/lib/FlightTasks/tasks/CMakeLists.txt
@@ -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)