From c4d86b9e4eadca778349ea50f1f0be8a4335eca0 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Mon, 13 Sep 2010 14:51:31 -0700 Subject: Include libexpat.so.1 in the list of libs to copy. --- indra/cmake/Copy3rdPartyLibs.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 2dd296bf12..95ed5d6bc8 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -221,6 +221,7 @@ elseif(LINUX) libcrypto.so.0.9.7 libdb-4.2.so libexpat.so + libexpat.so.1 libgmock_main.so libgmock.so.0 libgmodule-2.0.so -- cgit v1.2.3 From 245842a765c8416fc0e0d5c38d0cb731ed7d5cbf Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 23 Sep 2010 11:25:40 -0400 Subject: SH-64 update GLOD on mac updated GLOD again to be searched for in the correct place and updated some cmake configuration to ensure that it is being referred to in the correct places. This appears to finally solve our mac startup crash. --- indra/cmake/Copy3rdPartyLibs.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..76cb0553f3 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -169,7 +169,8 @@ elseif(DARWIN) libaprutil-1.dylib libexpat.0.5.0.dylib libexpat.dylib - libllqtwebkit.dylib + libGLOD.dylib + libllqtwebkit.dylib libndofdev.dylib libexception_handler.dylib ) -- cgit v1.2.3 From 7f9285979d744ee3591f810928e2ab570baba90e Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 23 Sep 2010 14:59:03 -0400 Subject: WIP make tcmalloc work on linux (JIRA pending) First pass at integrating the linux version of tcmalloc. Code will be reviewed in a later commit before pushing. --- 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 9900a8fb45..915f9c183f 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -235,7 +235,7 @@ elseif(LINUX) libopenjpeg.so libssl.so libstacktrace.so - libtcmalloc.so + libtcmalloc_minimal.so libuuid.so.1 libssl.so.0.9.7 ) -- cgit v1.2.3 From 1ac289bac95db85c90058ed333ff8cb261d93c6f Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 23 Sep 2010 16:46:02 -0400 Subject: SH-211 FIX update viewer-mesh branch to use new tcmalloc package Finished changes to make viewer-mesh make use of tcmalloc on linux. Almost all changes are juggling cmake config files, to make sure that the package is downloaded, installed, moved at the right times, and linked at the right times. Code reviewed by Seraph --- indra/cmake/Copy3rdPartyLibs.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 915f9c183f..923c0e160e 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,6 +236,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc_minimal.so + libtcmalloc_minimal.so.0 libuuid.so.1 libssl.so.0.9.7 ) -- cgit v1.2.3