Skip to content

CMake: Simplify VideoManager Linking #12498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2025
Merged

CMake: Simplify VideoManager Linking #12498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/API/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ target_link_libraries(API
Qt6::Qml
AnalyzeView
FactSystem
GStreamerReceiver
Joystick
MAVLink
QtMultimediaReceiver
Settings
Utilities
VideoManager
VideoReceiver
PUBLIC
Qt6::Core
Qt6::Gui
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ target_link_libraries(QGC
FollowMe
Gimbal
GPS
GStreamerReceiver
Joystick
MAVLink
MissionManager
Expand Down
3 changes: 0 additions & 3 deletions src/Settings/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,10 @@ target_link_libraries(Settings
PRIVATE
Qt6::Multimedia
API
GStreamerReceiver
QGC
QmlControls
QtMultimediaReceiver
Vehicle
VideoManager
VideoReceiver
PUBLIC
Qt6::Core
Qt6::Qml
Expand Down
3 changes: 0 additions & 3 deletions src/VideoManager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ target_link_libraries(VideoManager
API
Camera
FactSystem
GStreamerReceiver
QmlControls
QtMultimediaReceiver
Settings
Utilities
Vehicle
VideoReceiver
PUBLIC
Qt6::Core
Qt6::QmlIntegration
Expand Down
6 changes: 3 additions & 3 deletions src/VideoManager/VideoReceiver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
find_package(Qt6 REQUIRED COMPONENTS Core)

qt_add_library(VideoReceiver STATIC VideoReceiver.h)
target_sources(VideoManager PRIVATE VideoReceiver.h)

target_link_libraries(VideoReceiver PUBLIC Qt6::Core)
target_link_libraries(VideoManager PUBLIC Qt6::Core)

target_include_directories(VideoReceiver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(VideoManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

add_subdirectory(GStreamer)
add_subdirectory(QtMultimedia)
15 changes: 7 additions & 8 deletions src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
find_package(Qt6 REQUIRED COMPONENTS Core Quick)

qt_add_library(GStreamerReceiver STATIC GLVideoItemStub.h)
target_sources(VideoManager PRIVATE GLVideoItemStub.h)

target_link_libraries(GStreamerReceiver PUBLIC Qt6::Quick)
target_link_libraries(VideoManager PUBLIC Qt6::Quick)

target_include_directories(GStreamerReceiver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(VideoManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

if(NOT QGC_ENABLE_GST_VIDEOSTREAMING)
return()
Expand All @@ -16,7 +16,7 @@ if(NOT TARGET gstqml6gl)
return()
endif()

target_sources(GStreamerReceiver
target_sources(VideoManager
PRIVATE
gstqgc.cc
gstqgcelement.cc
Expand All @@ -30,21 +30,20 @@ target_sources(GStreamerReceiver
)

if(IOS)
target_sources(GStreamerReceiver
target_sources(VideoManager
PRIVATE
gst_ios_init.m
gst_ios_init.h
)
endif()

target_link_libraries(GStreamerReceiver
target_link_libraries(VideoManager
PRIVATE
gstqml6gl
Settings
Utilities
VideoReceiver
PUBLIC
Qt6::Core
)

target_compile_definitions(GStreamerReceiver PUBLIC QGC_GST_STREAMING)
target_compile_definitions(VideoManager PUBLIC QGC_GST_STREAMING)
15 changes: 6 additions & 9 deletions src/VideoManager/VideoReceiver/QtMultimedia/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
find_package(Qt6 REQUIRED COMPONENTS Core)

qt_add_library(QtMultimediaReceiver STATIC)

if(NOT QGC_ENABLE_QT_VIDEOSTREAMING)
return()
endif()

find_package(Qt6 REQUIRED COMPONENTS Multimedia MultimediaQuickPrivate Quick)

target_sources(QtMultimediaReceiver
target_sources(VideoManager
PRIVATE
QtMultimediaReceiver.cc
QtMultimediaReceiver.h
)

target_link_libraries(QtMultimediaReceiver
target_link_libraries(VideoManager
PRIVATE
Qt6::MultimediaQuickPrivate
Qt6::Quick
Expand All @@ -23,19 +21,18 @@ target_link_libraries(QtMultimediaReceiver
PUBLIC
Qt6::Core
Qt6::Multimedia
VideoReceiver
)

target_include_directories(QtMultimediaReceiver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(VideoManager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

target_compile_definitions(QtMultimediaReceiver PUBLIC QGC_QT_STREAMING)
target_compile_definitions(VideoManager PUBLIC QGC_QT_STREAMING)

if(NOT QGC_ENABLE_UVC)
target_compile_definitions(QtMultimediaReceiver PUBLIC QGC_DISABLE_UVC)
target_compile_definitions(VideoManager PUBLIC QGC_DISABLE_UVC)
return()
endif()

target_sources(QtMultimediaReceiver
target_sources(VideoManager
PRIVATE
UVCReceiver.cc
UVCReceiver.h
Expand Down
Loading