Browse Source

Correctly enable Video if build with CMake

QGC4.4
Tomaz Canabrava 6 years ago committed by Daniel Agar
parent
commit
e0bf95275d
  1. 10
      CMakeLists.txt
  2. 1
      src/CMakeLists.txt
  3. 1
      src/VideoStreaming/CMakeLists.txt

10
CMakeLists.txt

@ -10,7 +10,6 @@ set(CMAKE_AUTOUIC ON) @@ -10,7 +10,6 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# CMake build type
# Debug Release RelWithDebInfo MinSizeRel Coverage
if (NOT CMAKE_BUILD_TYPE)
@ -67,7 +66,14 @@ pkg_check_modules(GST @@ -67,7 +66,14 @@ pkg_check_modules(GST
gstreamer-1.0>=1.14
gstreamer-video-1.0>=1.14
)
if (GST_FOUND)
include_directories(
${GST_INCLUDE_DIRS}
)
add_definitions(
-DQGC_GST_STREAMING
)
endif()
#=============================================================================
# Qt5
#

1
src/CMakeLists.txt

@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${Qt5Location_PRIVATE_INCLUDE_DIRS}
)

1
src/VideoStreaming/CMakeLists.txt

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
if (GST_FOUND)
include_directories(
${GST_INCLUDE_DIRS}
gstqtvideosink/utils/
)

Loading…
Cancel
Save