From f4927eab42b040ebeed4b46df259277acc41c4fb Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabraba@kde.org>
Date: Wed, 19 Feb 2020 18:37:42 +0000
Subject: [PATCH] Move the VideoManager also in CMake

---
 src/CMakeLists.txt                |  1 -
 src/FlightDisplay/CMakeLists.txt  | 11 -----------
 src/VideoStreaming/CMakeLists.txt |  2 ++
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dff5582d..6be6af89e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,7 +157,6 @@ target_link_libraries(qgc
 		comm
 		FactSystem
 		FirmwarePlugin
-		FlightDisplay
 		FlightMap
 		FollowMe
 		Geo
diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt
index 93dc18baa..d7a3ea2be 100644
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@@ -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
 	PreFlightSoundCheck.qml
 	VirtualJoystick.qml
 )
-
-target_include_directories(FlightDisplay PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/VideoStreaming/CMakeLists.txt b/src/VideoStreaming/CMakeLists.txt
index 45f680544..7b142574f 100644
--- a/src/VideoStreaming/CMakeLists.txt
+++ b/src/VideoStreaming/CMakeLists.txt
@@ -13,6 +13,8 @@ add_library(VideoStreaming
     VideoReceiver.h
     VideoStreaming.cc
     VideoStreaming.h
+    VideoManager.cc
+    VideoManager.h
 )
 
 target_link_libraries(VideoStreaming
-- 
2.22.0