Browse Source

Move the VideoManager also in CMake

QGC4.4
Tomaz Canabrava 5 years ago
parent
commit
f4927eab42
  1. 1
      src/CMakeLists.txt
  2. 11
      src/FlightDisplay/CMakeLists.txt
  3. 2
      src/VideoStreaming/CMakeLists.txt

1
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

11
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})

2
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

Loading…
Cancel
Save