From 3de0581adbb0d5d51a290ba75d0e27cdb1903b07 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 26 Jun 2010 18:43:18 -0500
Subject: Fixed cmake not finding Mac libxml2 and libpng12.

---
 linden/indra/cmake/GStreamer.cmake | 14 +-------------
 linden/indra/cmake/PNG.cmake       |  6 +++++-
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 55a8f43..f5f9c03 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -71,18 +71,6 @@ else (WINDOWS)
     use_prebuilt_binary(neon)
     use_prebuilt_binary(theora)
 
-    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
@@ -92,7 +80,7 @@ else (WINDOWS)
         gmodule-2.0
         gthread-2.0
         glib-2.0
-        ${XML2_LIB}
+        xml2.2
         )
 
   else (DARWIN) # Linux
diff --git a/linden/indra/cmake/PNG.cmake b/linden/indra/cmake/PNG.cmake
index d08476d..23c3564 100644
--- a/linden/indra/cmake/PNG.cmake
+++ b/linden/indra/cmake/PNG.cmake
@@ -8,6 +8,10 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES png12)
+  if( DARWIN )
+    set(PNG_LIBRARIES png12.0)
+  else( DARWIN )
+    set(PNG_LIBRARIES png12)
+  endif (DARWIN)
   set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
-- 
cgit v1.1