From b195e7a0d78d66d256688be01385cede58b0894e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Mar 2011 17:17:10 -0700
Subject: Fixed missing use_prebuilt_binary(gstreamer-plugins) from
 GStreamer010Plugin.cmake and fixed some out-of-date lib requirements for
 Windows

---
 linden/indra/cmake/GStreamer010Plugin.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index ccad5be..9d2c553 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -10,9 +10,8 @@ if (STANDALONE)
 else (STANDALONE)
 
   # Possibly libxml and glib should have their own .cmake file instead...
-  use_prebuilt_binary(glib)			# gstreamer needs glib
-  use_prebuilt_binary(libxml)
-  use_prebuilt_binary(gstreamer)
+  use_prebuilt_binary(gstreamer)	# includes glib, libxml, and iconv on Windows
+  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   if (WINDOWS)
@@ -22,6 +21,8 @@ else (STANDALONE)
 		${LIBS_PREBUILT_DIR}/include/libxml2
 		)
   else (WINDOWS)
+    use_prebuilt_binary(glib)			# gstreamer needs glib
+	use_prebuilt_binary(libxml)
 	set(GSTREAMER010_INCLUDE_DIRS
 		${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
 		${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-- 
cgit v1.1