From 887295546c6b2d6b14362b0f87ebf8328e7400e6 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 10 Apr 2009 19:33:13 -0500
Subject: Help Mac find the right libxml2.2.dylib.

---
 ChangeLog.txt                      |  4 ++++
 linden/indra/cmake/GStreamer.cmake | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7339afd..2886c58 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
 2009-04-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/cmake/GStreamer.cmake:
+	Help Mac find the right libxml2.2.dylib.
+
+
 	* linden/indra/newview/viewer_manifest.py:
 	Tweaked Mac lib manifest.
 	Removed pango, commented out libopenal, added libxml2.
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index c1bbc57..880233e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -64,6 +64,18 @@ else (WINDOWS)
 
   if (DARWIN)
 
+    find_library( XML2_LIB
+      NAMES xml2.2
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      DOC "libxml2 dynamic library / shared object" )
+
+    if (NOT XML2_LIB)
+      message(FATAL_ERROR "libxml2 not found!")
+    else (NOT XML2_LIB)
+      #message(STATUS "libxml2 found: ${XML2_LIB}")
+    endif (NOT XML2_LIB)
+
     set(GSTREAMER_LIBRARIES
         gstvideo-0.10
         gstaudio-0.10
@@ -73,7 +85,7 @@ else (WINDOWS)
         gmodule-2.0
         gthread-2.0
         glib-2.0
-        xml2
+        ${XML2_LIB}
         )
 
   else (DARWIN)
-- 
cgit v1.1