[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon-gstreamer] cmake: Fix build on Gentoo with recent GStreamer 1.0.
From:       Michael Pyne <mpyne () kde ! org>
Date:       2015-12-31 17:34:06
Message-ID: E1aEh70-0000Yx-K7 () scm ! kde ! org
[Download RAW message or body]

Git commit e04802d7ce5b51575fcf8ad4dd18177fe079f7aa by Michael Pyne.
Committed on 31/12/2015 at 17:32.
Pushed by mpyne into branch 'master'.

Fix build on Gentoo with recent GStreamer 1.0.

Partially fixed by RR 125690, this also fixes for Gentoo in my testing,
and should for other distros where gstreamer places its gst-config under
gstreamer-1.0/include.

REVIEW:126554

M  +1    -1    cmake/FindGStreamer.cmake

http://commits.kde.org/phonon-gstreamer/e04802d7ce5b51575fcf8ad4dd18177fe07=
9f7aa

diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index e30c349..1375b30 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -44,7 +44,7 @@ ENDIF (NOT GSTREAMER_INCLUDE_DIR)
 FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
    PATHS
    ${PKG_GSTREAMER_INCLUDE_DIRS}
-   PATH_SUFFIXES gstreamer-1.0
+   PATH_SUFFIXES gstreamer-1.0 gstreamer-1.0/include
    )
 =

 IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
[prev in list] [next in list] [prev in thread] [next in thread]