From 6f2faa65f9841919566b567d74b258a1c559ec0e Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Wed, 27 Oct 2010 22:28:48 +0200
Subject: Load prebuilt glib when needed. Don't compile gstreamer plugin on
 windows.

Also, darwin doesn't use quicktime, so disabled compiling that plugin
for darwin.
---
 linden/indra/cmake/DBusGlib.cmake           |  1 +
 linden/indra/cmake/GStreamer010Plugin.cmake | 14 ++++++++------
 linden/indra/cmake/UI.cmake                 |  3 ++-
 linden/indra/media_plugins/CMakeLists.txt   |  8 +++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
index dfda0ad..b78a0b1 100644
--- a/linden/indra/cmake/DBusGlib.cmake
+++ b/linden/indra/cmake/DBusGlib.cmake
@@ -7,6 +7,7 @@ if (STANDALONE)
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
 
 elseif (LINUX)
+  use_prebuilt_binary(glib)		# dbusglib needs glib
   use_prebuilt_binary(dbusglib)
   set(DBUSGLIB_FOUND ON FORCE BOOL)
   set(DBUSGLIB_INCLUDE_DIRS
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 878d3c0..90ed35c 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -6,12 +6,13 @@ if (STANDALONE)
 
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-endif (STANDALONE)
 
-if (LINUX)
-  use_prebuilt_binary(gstreamer)
-  # possible libxml should have its own .cmake file instead
+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)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
@@ -19,8 +20,9 @@ if (LINUX)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
-endif (LINUX)
-      
+
+endif (STANDALONE)
+
 if (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index 9d068c4..7a02dff 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -31,8 +31,9 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  use_prebuilt_binary(gtk-etc)
   if (LINUX)
+    use_prebuilt_binary(glib)		# gtk-etc needs glib
+    use_prebuilt_binary(gtk-etc)
     set(UI_LIBRARIES
         atk-1.0
         cairo
diff --git a/linden/indra/media_plugins/CMakeLists.txt b/linden/indra/media_plugins/CMakeLists.txt
index cc03d9c..c4f2555 100755
--- a/linden/indra/media_plugins/CMakeLists.txt
+++ b/linden/indra/media_plugins/CMakeLists.txt
@@ -4,10 +4,12 @@ add_subdirectory(base)
 
 add_subdirectory(webkit)
 
-add_subdirectory(gstreamer010)
+if (LINUX OR DARWIN)
+    add_subdirectory(gstreamer010)
+endif (LINUX OR DARWIN)
 
-if (WINDOWS OR DARWIN)
+if (WINDOWS)
     add_subdirectory(quicktime)
-endif (WINDOWS OR DARWIN)
+endif (WINDOWS)
 
 add_subdirectory(example)
-- 
cgit v1.1