From e0bf95275d286bf5e15c5ffab2cb0ee0901e9764 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 30 Jun 2019 11:42:28 +0200 Subject: [PATCH] Correctly enable Video if build with CMake --- CMakeLists.txt | 10 ++++++++-- src/CMakeLists.txt | 1 - src/VideoStreaming/CMakeLists.txt | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32826c09e..e28188d3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 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 # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7a425a67c..0c557d791 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} - ${Qt5Location_PRIVATE_INCLUDE_DIRS} ) diff --git a/src/VideoStreaming/CMakeLists.txt b/src/VideoStreaming/CMakeLists.txt index 97f4ad4f3..6bf5c3712 100644 --- a/src/VideoStreaming/CMakeLists.txt +++ b/src/VideoStreaming/CMakeLists.txt @@ -1,6 +1,5 @@ if (GST_FOUND) include_directories( - ${GST_INCLUDE_DIRS} gstqtvideosink/utils/ ) -- 2.22.0