Move the VideoManager also in CMake

5 years ago · f4927eab42
3 changed files with 2 additions and 12 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -157,7 +157,6 @@ target_link_libraries(qgc
				@@ -157,7 +157,6 @@ target_link_libraries(qgc
 		comm
 		FactSystem
 		FirmwarePlugin
-		FlightDisplay
 		FlightMap
 		FollowMe
 		Geo
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@ -1,13 +1,4 @@
				@@ -1,13 +1,4 @@

-add_library(FlightDisplay
-	VideoManager.cc
-)
-
-target_link_libraries(FlightDisplay
-	PRIVATE
-		qgc
-)
-
 add_custom_target(FligthDisplayQml
 SOURCES
 	FlightDisplayView.qml       
@ -28,5 +19,3 @@ SOURCES
				@@ -28,5 +19,3 @@ SOURCES
 	PreFlightSoundCheck.qml
 	VirtualJoystick.qml
 )
-
-target_include_directories(FlightDisplay PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--- a/src/VideoStreaming/CMakeLists.txt
+++ b/src/VideoStreaming/CMakeLists.txt
@ -13,6 +13,8 @@ add_library(VideoStreaming
				@@ -13,6 +13,8 @@ add_library(VideoStreaming
    VideoReceiver.h
    VideoStreaming.cc
    VideoStreaming.h
+    VideoManager.cc
+    VideoManager.h
 )

 target_link_libraries(VideoStreaming