cmake create uav library in src/uas

7 years ago · 7b74b306df
2 changed files with 21 additions and 10 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -14,7 +14,6 @@ include_directories(
				@@ -14,7 +14,6 @@ include_directories(
 	PositionManager
 	qgcunittest
 	Terrain
-	uas
 	Vehicle
 	ViewWidgets
 )
@ -138,10 +137,6 @@ add_library(qgc
				@@ -138,10 +137,6 @@ add_library(qgc

 	Terrain/TerrainQuery.cc

-	uas/FileManager.cc
-	uas/UAS.cc
-	uas/UASMessageHandler.cc
-
 	Vehicle/ADSBVehicle.cc
 	Vehicle/GPSRTKFactGroup.cc
 	Vehicle/MAVLinkLogManager.cc
@ -176,11 +171,6 @@ add_library(qgc
				@@ -176,11 +171,6 @@ add_library(qgc
 	UTM.cpp
 	main.cc

-	# HEADERS
-	# shouldn't be listed here, but aren't named properly for AUTOMOC
-	uas/UAS.h
-	uas/UASInterface.h
-
 	# UI
 	QGCQmlWidgetHolder.ui

@ -203,6 +193,7 @@ add_subdirectory(MissionManager)
				@@ -203,6 +193,7 @@ add_subdirectory(MissionManager)
 add_subdirectory(QmlControls)
 add_subdirectory(QtLocationPlugin)
 add_subdirectory(Settings)
+add_subdirectory(uas)
 add_subdirectory(VehicleSetup)
 add_subdirectory(VideoStreaming)

@ -239,6 +230,7 @@ target_link_libraries(qgc
				@@ -239,6 +230,7 @@ target_link_libraries(qgc
 	QmlControls
 	QtLocationPlugin
 	Settings
+	uas
 	ui
 	VehicleSetup
 	VideoStreaming
--- a/src/uas/CMakeLists.txt
+++ b/src/uas/CMakeLists.txt
@ -0,0 +1,19 @@
				@@ -0,0 +1,19 @@
+
+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
+)
+
+target_link_libraries(uas
+	PUBLIC
+		qgc
+)
+
+target_include_directories(uas PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+