From 73ecb506544c01e1684737b8da0a354d4a8d3d45 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 20 Jul 2020 20:03:22 -0400
Subject: [PATCH] cmake fixes

---
 src/CMakeLists.txt         |  3 +++
 src/Vehicle/CMakeLists.txt | 30 ++++++++++++++++++++++++++----
 src/comm/CMakeLists.txt    | 20 ++++++++++++++++++--
 src/uas/CMakeLists.txt     |  7 ++-----
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9be8fce15..28ce963e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,6 +119,8 @@ add_library(qgc
 	QGCTemporaryFile.h
 	QGCToolbox.cc
 	QGCToolbox.h
+	QGCZlib.cc
+	QGCZlib.h
 	RunGuard.cc
 	RunGuard.h
 	ShapeFileHelper.cc
@@ -168,6 +170,7 @@ target_link_libraries(qgc
 	PRIVATE
 		shp
                 Qt5::QuickControls2
+                z # zlib
 
 	PUBLIC
 		Qt5::QuickWidgets
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 85b9cd115..6d271954b 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -2,24 +2,46 @@
 set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
-		SendMavCommandTest.cc
-		SendMavCommandTest.h
+		FTPManagerTest.cc
+		FTPManagerTest.h
+		InitialConnectTest.cc
+		InitialConnectTest.h
+		RequestMessageTest.cc
+		RequestMessageTest.h
+		SendMavCommandWithHandlerTest.cc
+		SendMavCommandWithHandlerTest.h
+		SendMavCommandWithSignallingTest.cc
+		SendMavCommandWithSignallingTest.h
 	)
 endif()
 
 add_library(Vehicle
+	CompInfo.cc
+	CompInfo.h
+	CompInfoParam.cc
+	CompInfoParam.h
+	CompInfoVersion.cc
+	CompInfoVersion.h
+	ComponentInformationManager.cc
+	ComponentInformationManager.h
+	FTPManager.cc
+	FTPManager.h
 	GPSRTKFactGroup.cc
 	GPSRTKFactGroup.h
+	InitialConnectStateMachine.cc
+	InitialConnectStateMachine.h
 	MAVLinkLogManager.cc
 	MAVLinkLogManager.h
 	MultiVehicleManager.cc
 	MultiVehicleManager.h
-	TrajectoryPoints.cc
-	TrajectoryPoints.h
+	StateMachine.cc
+	StateMachine.h
 	TerrainFactGroup.cc
 	TerrainFactGroup.h
 	TerrainProtocolHandler.cc
 	TerrainProtocolHandler.h
+	TrajectoryPoints.cc
+	TrajectoryPoints.h
 	Vehicle.cc
 	Vehicle.h
 	VehicleObjectAvoidance.cc
diff --git a/src/comm/CMakeLists.txt b/src/comm/CMakeLists.txt
index f01dcf254..3f269f722 100644
--- a/src/comm/CMakeLists.txt
+++ b/src/comm/CMakeLists.txt
@@ -3,25 +3,41 @@ set(EXTRA_SRC)
 if(BUILD_TESTING)
 	list(APPEND EXTRA_SRC
 		MockLink.cc
-		MockLinkFileServer.cc
+		MockLink.h
+		MockLinkFTP.cc
+		MockLinkFTP.h
 		MockLinkMissionItemHandler.cc
+		MockLinkMissionItemHandler.h
 	)
 endif()
 
 add_library(comm
 	#BluetoothLink.cc
+	#BluetoothLink.h
 	LinkConfiguration.cc
+	LinkConfiguration.h
 	LinkInterface.cc
+	LinkInterface.h
 	LinkManager.cc
+	LinkManager.h
 	LogReplayLink.cc
+	LogReplayLink.h
 	MavlinkMessagesTimer.cc
+	MavlinkMessagesTimer.h
 	MAVLinkProtocol.cc
+	MAVLinkProtocol.h
 	QGCMAVLink.cc
+	QGCMAVLink.h
 	QGCSerialPortInfo.cc
+	QGCSerialPortInfo.h
 	SerialLink.cc
+	SerialLink.h
 	TCPLink.cc
-	UDPLink.cc
+	TCPLink.h
 	UdpIODevice.cc
+	UdpIODevice.h
+	UDPLink.cc
+	UDPLink.h
 
 	${EXTRA_SRC}
 )
diff --git a/src/uas/CMakeLists.txt b/src/uas/CMakeLists.txt
index edb9b2d30..f6c217167 100644
--- a/src/uas/CMakeLists.txt
+++ b/src/uas/CMakeLists.txt
@@ -1,13 +1,10 @@
 
 add_library(uas
-	FileManager.cc
 	UAS.cc
-	UASMessageHandler.cc
-
-	# HEADERS
-	# shouldn't be listed here, but aren't named properly for AUTOMOC
 	UAS.h
 	UASInterface.h
+	UASMessageHandler.cc
+	UASMessageHandler.h
 )
 
 target_link_libraries(uas
-- 
2.22.0