Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4077fc18
Commit
4077fc18
authored
Oct 25, 2018
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake create VideoStreaming library in src/VideoStreaming
parent
bff39b26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
40 deletions
+44
-40
CMakeLists.txt
src/CMakeLists.txt
+5
-40
CMakeLists.txt
src/VideoStreaming/CMakeLists.txt
+39
-0
No files found.
src/CMakeLists.txt
View file @
4077fc18
...
@@ -16,7 +16,6 @@ include_directories(
...
@@ -16,7 +16,6 @@ include_directories(
Terrain
Terrain
uas
uas
Vehicle
Vehicle
VideoStreaming
ViewWidgets
ViewWidgets
)
)
...
@@ -107,45 +106,12 @@ if(BUILD_TESTING)
...
@@ -107,45 +106,12 @@ if(BUILD_TESTING)
endif
()
endif
()
if
(
VIDEO
)
list
(
APPEND QGC_SRC
VideoStreaming/gstqtvideosink/delegates/basedelegate.cpp
VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.cpp
VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.cpp
VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
VideoStreaming/gstqtvideosink/gstqtglvideosink.cpp
VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.cpp
VideoStreaming/gstqtvideosink/gstqtquick2videosink.cpp
VideoStreaming/gstqtvideosink/gstqtvideosink.cpp
VideoStreaming/gstqtvideosink/gstqtvideosinkbase.cpp
VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.cpp
VideoStreaming/gstqtvideosink/gstqwidgetvideosink.cpp
VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.cpp
VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.cpp
VideoStreaming/gstqtvideosink/painters/videomaterial.cpp
VideoStreaming/gstqtvideosink/painters/videonode.cpp
VideoStreaming/gstqtvideosink/utils/bufferformat.cpp
VideoStreaming/gstqtvideosink/utils/utils.cpp
)
endif
()
set
(
QGC_RESOURCES
)
list
(
APPEND QGC_RESOURCES
)
if
(
BUILD_TESTING
)
if
(
BUILD_TESTING
)
list
(
APPEND QGC_RESOURCES
list
(
APPEND QGC_RESOURCES
UnitTest.qrc
UnitTest.qrc
)
)
endif
()
endif
()
set
(
QGC_UI
)
list
(
APPEND QGC_UI
QGCQmlWidgetHolder.ui
)
add_library
(
qgc
add_library
(
qgc
${
QGC_RESOURCES
}
${
QGC_RESOURCES
}
...
@@ -182,11 +148,6 @@ add_library(qgc
...
@@ -182,11 +148,6 @@ add_library(qgc
Vehicle/MultiVehicleManager.cc
Vehicle/MultiVehicleManager.cc
Vehicle/Vehicle.cc
Vehicle/Vehicle.cc
VideoStreaming/VideoItem.cc
VideoStreaming/VideoReceiver.cc
VideoStreaming/VideoStreaming.cc
VideoStreaming/VideoSurface.cc
ViewWidgets/CustomCommandWidget.cc
ViewWidgets/CustomCommandWidget.cc
ViewWidgets/CustomCommandWidgetController.cc
ViewWidgets/CustomCommandWidgetController.cc
ViewWidgets/ViewWidgetController.cc
ViewWidgets/ViewWidgetController.cc
...
@@ -220,6 +181,9 @@ add_library(qgc
...
@@ -220,6 +181,9 @@ add_library(qgc
uas/UAS.h
uas/UAS.h
uas/UASInterface.h
uas/UASInterface.h
# UI
QGCQmlWidgetHolder.ui
)
)
set_source_files_properties
(
QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION=
"
${
git_tag
}
"
)
set_source_files_properties
(
QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION=
"
${
git_tag
}
"
)
...
@@ -240,7 +204,7 @@ add_subdirectory(QmlControls)
...
@@ -240,7 +204,7 @@ add_subdirectory(QmlControls)
add_subdirectory
(
QtLocationPlugin
)
add_subdirectory
(
QtLocationPlugin
)
add_subdirectory
(
Settings
)
add_subdirectory
(
Settings
)
add_subdirectory
(
VehicleSetup
)
add_subdirectory
(
VehicleSetup
)
add_subdirectory
(
VideoStreaming
)
target_link_libraries
(
qgc
target_link_libraries
(
qgc
...
@@ -277,6 +241,7 @@ target_link_libraries(qgc
...
@@ -277,6 +241,7 @@ target_link_libraries(qgc
Settings
Settings
ui
ui
VehicleSetup
VehicleSetup
VideoStreaming
)
)
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
src/VideoStreaming/CMakeLists.txt
0 → 100644
View file @
4077fc18
set
(
EXTRA_SRC
)
if
(
VIDEO
)
list
(
APPEND EXTRA_SRC
gstqtvideosink/delegates/basedelegate.cpp
gstqtvideosink/delegates/qtquick2videosinkdelegate.cpp
gstqtvideosink/delegates/qtvideosinkdelegate.cpp
gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp
gstqtvideosink/gstqtglvideosink.cpp
gstqtvideosink/gstqtglvideosinkbase.cpp
gstqtvideosink/gstqtquick2videosink.cpp
gstqtvideosink/gstqtvideosink.cpp
gstqtvideosink/gstqtvideosinkbase.cpp
gstqtvideosink/gstqtvideosinkplugin.cpp
gstqtvideosink/gstqwidgetvideosink.cpp
gstqtvideosink/painters/genericsurfacepainter.cpp
gstqtvideosink/painters/openglsurfacepainter.cpp
gstqtvideosink/painters/videomaterial.cpp
gstqtvideosink/painters/videonode.cpp
gstqtvideosink/utils/bufferformat.cpp
gstqtvideosink/utils/utils.cpp
)
endif
()
add_library
(
VideoStreaming
VideoItem.cc
VideoReceiver.cc
VideoStreaming.cc
VideoSurface.cc
${
EXTRA_SRC
}
)
target_link_libraries
(
VideoStreaming
PUBLIC
qgc
)
target_include_directories
(
VideoStreaming PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment