From 015597bb5878fe3c2932fe96fdf2e6dbeee5519d Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Sat, 12 Oct 2013 03:07:22 +0100
Subject: STORM-1831 Importing Oz's updates for libxml2

---
 indra/cmake/LLPrimitive.cmake | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/cmake/LLPrimitive.cmake')

diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 0d87ff579a..a9a8257f80 100755
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -6,7 +6,6 @@ include(Boost)
 
 use_prebuilt_binary(colladadom)
 use_prebuilt_binary(pcre)
-use_prebuilt_binary(libxml)
 
 set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
@@ -19,6 +18,16 @@ if (WINDOWS)
         optimized libcollada14dom22
         ${BOOST_SYSTEM_LIBRARIES}
         )
+elseif (LINUX)
+    use_prebuilt_binary(libxml2)
+    set(LLPRIMITIVE_LIBRARIES
+        llprimitive
+        collada14dom
+        minizip
+        xml2
+        pcrecpp
+        pcre
+        )
 else (WINDOWS)
     set(LLPRIMITIVE_LIBRARIES 
         llprimitive
-- 
cgit v1.2.3