From 9c66ac87fd46db3987e60ae50989b2497099480b Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Fri, 20 Jan 2012 18:06:32 +0100
Subject: STORM-276 Basic spellchecking framework

---
 indra/cmake/Copy3rdPartyLibs.cmake | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 394db362b1..ebeae3e5be 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -41,6 +41,7 @@ if(WINDOWS)
         libeay32.dll
         libcollada14dom22-d.dll
         glod.dll    
+        libhunspell.dll
         )
 
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
@@ -53,6 +54,7 @@ if(WINDOWS)
         libeay32.dll
         libcollada14dom22.dll
         glod.dll
+        libhunspell.dll
         )
 
     if(USE_GOOGLE_PERFTOOLS)
@@ -215,6 +217,7 @@ elseif(DARWIN)
     libllqtwebkit.dylib
     libminizip.a
         libndofdev.dylib
+        libhunspell-1.3.dylib
         libexception_handler.dylib
     libcollada14dom.dylib
        )
-- 
cgit v1.2.3


From e0f919711034ee4a112ae4b583486693bc104a7b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 25 Jan 2012 14:58:47 -0500
Subject: Fix for build failures when tcmalloc disabled

---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 394db362b1..8e5d901779 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -55,10 +55,10 @@ if(WINDOWS)
         glod.dll
         )
 
-    if(USE_GOOGLE_PERFTOOLS)
+    if(USE_TCMALLOC)
       set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
       set(release_files ${release_files} libtcmalloc_minimal.dll)
-    endif(USE_GOOGLE_PERFTOOLS)
+    endif(USE_TCMALLOC)
 
     if (FMOD)
       set(debug_files ${debug_files} fmod.dll)
-- 
cgit v1.2.3


From 16b6595fa75047c6c53ee11a6c3004e99ae0937d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 26 Jan 2012 13:38:11 -0500
Subject: trying to fix linux build error

---
 indra/cmake/Copy3rdPartyLibs.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 8e5d901779..966300f1c7 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -268,13 +268,16 @@ elseif(LINUX)
         libopenal.so
         libopenjpeg.so
         libssl.so
-        libtcmalloc_minimal.so
         libuuid.so.16
         libuuid.so.16.0.22
         libssl.so.1.0.0
         libfontconfig.so.1.4.4
        )
 
+    if (USE_TCMALLOC)
+      set(release_files ${release_files} "libtcmalloc_minimal.so")
+    endif (USE_TCMALLOC)
+
     if (FMOD)
       set(release_files ${release_files} "libfmod-3.75.so")
     endif (FMOD)
-- 
cgit v1.2.3


From 7bcfd3a4ae824d973802b1431a13e91eee18c89a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Apr 2012 17:27:54 -0400
Subject: fix version number of the libhunspell dylib in another place

---
 indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ebeae3e5be..6765d36ba3 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -217,7 +217,7 @@ elseif(DARWIN)
     libllqtwebkit.dylib
     libminizip.a
         libndofdev.dylib
-        libhunspell-1.3.dylib
+        libhunspell-1.3.0.dylib
         libexception_handler.dylib
     libcollada14dom.dylib
        )
-- 
cgit v1.2.3


From 9b64464d02918307048be6fe5f0b784010d38bf8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 Apr 2012 12:27:34 -0400
Subject: more attempts to fix the hunspell lib for Mac

---
 indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 6765d36ba3..224e0a8b51 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -214,12 +214,12 @@ elseif(DARWIN)
         libexpat.1.5.2.dylib
         libexpat.dylib
         libGLOD.dylib
-    libllqtwebkit.dylib
-    libminizip.a
+        libllqtwebkit.dylib
+        libminizip.a
         libndofdev.dylib
         libhunspell-1.3.0.dylib
         libexception_handler.dylib
-    libcollada14dom.dylib
+        libcollada14dom.dylib
        )
 
     # fmod is statically linked on darwin
@@ -260,14 +260,15 @@ elseif(LINUX)
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
-    libglod.so
+        libglod.so
         libgmock_main.so
         libgmock.so.0
         libgmodule-2.0.so
         libgobject-2.0.so
         libgtest_main.so
         libgtest.so.0
-    libminizip.so
+        libhunspell-1.3.so.0.0.0
+        libminizip.so
         libopenal.so
         libopenjpeg.so
         libssl.so
-- 
cgit v1.2.3