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

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Fix some CMake stuff
From:       Rohan Garg <rohan () kde ! org>
Date:       2014-04-03 13:14:03
Message-ID: E1WVhT1-0003fe-Kc () scm ! kde ! org
[Download RAW message or body]

Git commit 47427a657f66a2b3cb24258119f74147cb5b399b by Rohan Garg.
Committed on 02/04/2014 at 15:35.
Pushed by garg into branch '1.0-porting-for-merge'.

Fix some CMake stuff

M  +0    -1    gstreamer/CMakeLists.txt
M  +1    -1    gstreamer/ConfigureChecks.cmake

http://commits.kde.org/phonon-gstreamer/47427a657f66a2b3cb24258119f74147cb5=
b399b

diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt
index 8c8b068..7ca498e 100644
--- a/gstreamer/CMakeLists.txt
+++ b/gstreamer/CMakeLists.txt
@@ -68,7 +68,6 @@ if (BUILD_PHONON_GSTREAMER)
       plugininstaller.cpp
       qwidgetvideosink.cpp
       streamreader.cpp
-      videodataoutput.cpp
       videowidget.cpp
       volumefadereffect.cpp
       widgetrenderer.cpp
diff --git a/gstreamer/ConfigureChecks.cmake b/gstreamer/ConfigureChecks.cm=
ake
index f3e6f4f..11b48ca 100644
--- a/gstreamer/ConfigureChecks.cmake
+++ b/gstreamer/ConfigureChecks.cmake
@@ -15,7 +15,7 @@
 find_package(GStreamer)
 =

 if (GSTREAMER_FOUND)
-    macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is requi=
red for the multimedia backend" "http://gstreamer.freedesktop.org/modules/"=
 TRUE "1.0")
+    macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 1.0 is requir=
ed for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" =
TRUE "1.0")
     find_package(GStreamerPlugins REQUIRED)
 else()
     find_package(GStreamer0.10 REQUIRED)
[prev in list] [next in list] [prev in thread] [next in thread]