From 1c00bea6a47c7a53450b1d4bffba2293d1d0ebdd Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 25 Oct 2018 11:36:34 -0400
Subject: [PATCH] cmake create MissionManager library in src/MissionManager

---
 src/CMakeLists.txt                | 58 +----------------------
 src/MissionManager/CMakeLists.txt | 76 +++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 56 deletions(-)
 create mode 100644 src/MissionManager/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba2721636..7c6bc1da6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
 	FlightMap/Widgets
 	FollowMe
 	Joystick
-	MissionManager
 	PositionManager
 	qgcunittest
 	QmlControls
@@ -78,26 +77,6 @@ if(BUILD_TESTING)
 		FactSystem/FactSystemTestPX4.cc
 		FactSystem/ParameterManagerTest.cc
 
-		MissionManager/CameraCalcTest.cc
-		MissionManager/CameraSectionTest.cc
-		MissionManager/CorridorScanComplexItemTest.cc
-		MissionManager/MissionCommandTreeTest.cc
-		MissionManager/MissionControllerManagerTest.cc
-		MissionManager/MissionControllerTest.cc
-		MissionManager/MissionItemTest.cc
-		MissionManager/MissionManagerTest.cc
-		MissionManager/MissionSettingsTest.cc
-		MissionManager/PlanMasterControllerTest.cc
-		MissionManager/QGCMapPolygonTest.cc
-		MissionManager/QGCMapPolylineTest.cc
-		MissionManager/SectionTest.cc
-		MissionManager/SimpleMissionItemTest.cc
-		MissionManager/SpeedSectionTest.cc
-		MissionManager/StructureScanComplexItemTest.cc
-		MissionManager/SurveyComplexItemTest.cc
-		MissionManager/TransectStyleComplexItemTest.cc
-		MissionManager/VisualMissionItemTest.cc
-
 		qgcunittest/FileDialogTest.cc
 		qgcunittest/FileManagerTest.cc
 		qgcunittest/FlightGearTest.cc
@@ -266,40 +245,6 @@ add_library(qgc
 	Joystick/JoystickManager.cc
 	Joystick/JoystickSDL.cc
 
-	MissionManager/CameraCalc.cc
-	MissionManager/CameraSection.cc
-	MissionManager/CameraSpec.cc
-	MissionManager/ComplexMissionItem.cc
-	MissionManager/CorridorScanComplexItem.cc
-	MissionManager/FixedWingLandingComplexItem.cc
-	MissionManager/GeoFenceController.cc
-	MissionManager/GeoFenceManager.cc
-	MissionManager/KML.cc
-	MissionManager/MissionCommandList.cc
-	MissionManager/MissionCommandTree.cc
-	MissionManager/MissionCommandUIInfo.cc
-	MissionManager/MissionController.cc
-	MissionManager/MissionItem.cc
-	MissionManager/MissionManager.cc
-	MissionManager/MissionSettingsItem.cc
-	MissionManager/PlanElementController.cc
-	MissionManager/PlanManager.cc
-	MissionManager/PlanMasterController.cc
-	MissionManager/QGCFenceCircle.cc
-	MissionManager/QGCFencePolygon.cc
-	MissionManager/QGCMapCircle.cc
-	MissionManager/QGCMapPolygon.cc
-	MissionManager/QGCMapPolyline.cc
-	MissionManager/RallyPoint.cc
-	MissionManager/RallyPointController.cc
-	MissionManager/RallyPointManager.cc
-	MissionManager/SimpleMissionItem.cc
-	MissionManager/SpeedSection.cc
-	MissionManager/StructureScanComplexItem.cc
-	MissionManager/SurveyComplexItem.cc
-	MissionManager/TransectStyleComplexItem.cc
-	MissionManager/VisualMissionItem.cc
-
 	PositionManager/PositionManager.cpp
 	PositionManager/SimulatedPosition.cc
 
@@ -419,7 +364,6 @@ add_library(qgc
 	comm/QGCFlightGearLink.h
 	comm/QGCHilLink.h
 	comm/QGCJSBSimLink.h
-	MissionManager/Section.h
 	QtLocationPlugin/QGCMapEngineData.h
 	uas/UAS.h
 	uas/UASInterface.h
@@ -435,6 +379,7 @@ add_subdirectory(api)
 add_subdirectory(Audio)
 add_subdirectory(AutoPilotPlugins)
 add_subdirectory(GPS)
+add_subdirectory(MissionManager)
 
 target_link_libraries(qgc
 
@@ -462,6 +407,7 @@ target_link_libraries(qgc
 	AutoPilotPlugins
 	gps
 	qwt # LinechartWidget
+	MissionManager
 )
 
 target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/MissionManager/CMakeLists.txt b/src/MissionManager/CMakeLists.txt
new file mode 100644
index 000000000..427672ff3
--- /dev/null
+++ b/src/MissionManager/CMakeLists.txt
@@ -0,0 +1,76 @@
+
+set(EXTRA_SRC)
+if(BUILD_TESTING)
+	list(APPEND EXTRA_SRC
+		CameraCalcTest.cc
+		CameraSectionTest.cc
+		CorridorScanComplexItemTest.cc
+		MissionCommandTreeTest.cc
+		MissionControllerManagerTest.cc
+		MissionControllerTest.cc
+		MissionItemTest.cc
+		MissionManagerTest.cc
+		MissionSettingsTest.cc
+		PlanMasterControllerTest.cc
+		QGCMapPolygonTest.cc
+		QGCMapPolylineTest.cc
+		SectionTest.cc
+		SimpleMissionItemTest.cc
+		SpeedSectionTest.cc
+		StructureScanComplexItemTest.cc
+		SurveyComplexItemTest.cc
+		TransectStyleComplexItemTest.cc
+		VisualMissionItemTest.cc
+	)
+endif()
+
+add_library(MissionManager
+	CameraCalc.cc
+	CameraSection.cc
+	CameraSpec.cc
+	ComplexMissionItem.cc
+	CorridorScanComplexItem.cc
+	FixedWingLandingComplexItem.cc
+	GeoFenceController.cc
+	GeoFenceManager.cc
+	KML.cc
+	MissionCommandList.cc
+	MissionCommandTree.cc
+	MissionCommandUIInfo.cc
+	MissionController.cc
+	MissionItem.cc
+	MissionManager.cc
+	MissionSettingsItem.cc
+	PlanElementController.cc
+	PlanManager.cc
+	PlanMasterController.cc
+	QGCFenceCircle.cc
+	QGCFencePolygon.cc
+	QGCMapCircle.cc
+	QGCMapPolygon.cc
+	QGCMapPolyline.cc
+	RallyPoint.cc
+	RallyPointController.cc
+	RallyPointManager.cc
+	SimpleMissionItem.cc
+	SpeedSection.cc
+	StructureScanComplexItem.cc
+	SurveyComplexItem.cc
+	TransectStyleComplexItem.cc
+	VisualMissionItem.cc
+
+	Section.h # shouldn't be listed here, but isn't named properly for AUTOMOC
+
+	${EXTRA_SRC}
+)
+
+target_link_libraries(MissionManager
+	PUBLIC
+		qgc
+)
+
+target_include_directories(MissionManager
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+	)
+
-- 
2.22.0