From bb51a764ece0f48161ddea1c519a7e427ccfdf23 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 8 Sep 2010 11:30:50 -0400
Subject: SNOW-606 FIX disable packaging of libuuid

Patch taken from JIRA, committing locally to fix our project branch.
Code reviewed by Nyx / Brad
(transplanted from 06c4d6b5d67f6624d76b5a7f61021ef2d53f44b4)
---
 indra/cmake/APR.cmake              | 2 +-
 indra/cmake/Copy3rdPartyLibs.cmake | 1 -
 indra/cmake/ViewerMiscLibs.cmake   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 180504d286..b6f1e06edd 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -56,7 +56,7 @@ else (STANDALONE)
 
   if (LINUX)
     if (VIEWER)
-      list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
+      list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
     endif (VIEWER)
     list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
   endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 2dd296bf12..a756770881 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -232,7 +232,6 @@ elseif(LINUX)
         libssl.so
         libstacktrace.so
         libtcmalloc.so
-        libuuid.so.1
         libssl.so.0.9.7
        )
 
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 32c4bc81df..5710360de2 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,7 +2,6 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
-  use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
-- 
cgit v1.2.3