61d2da233d
The GStreamer core how has multiple include dirs, and freerdp rolls it own detection code and figuring our which include dirs to use. Instead use pkg-config to get the correct include dirs. Submitted by: antoine@
16 lines
807 B
CMake
16 lines
807 B
CMake
Don't use custom code to find the include dirs for gstreamer 1.0 (core).
|
|
Since 1.6.0 there are multiple include paths. So use pkg-config to find
|
|
which. IMO the rest of this file should use pkg-config....
|
|
|
|
--- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +0200
|
|
+++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200
|
|
@@ -78,7 +78,8 @@
|
|
# 1.1. Find headers and libraries
|
|
set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
|
|
find_package(Glib REQUIRED)
|
|
-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
|
|
+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
|
|
+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
|
|
FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
|
|
|
|
# 1.2. Check Gstreamer version
|