From c504c40a754a79baf0e4b1d1c10ca44197d577df Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 29 Jan 2010 15:04:14 -0800 Subject: Added glod.txt and libraries no longer unzipped into newview --- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..9a54c7a2e8 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,6 +38,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables @@ -48,6 +50,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) -- cgit v1.2.3 From f5f20a7851ddfa5f2b5d24c5a392acf9c0a745b5 Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 29 Jan 2010 15:06:55 -0800 Subject: got rid of tab --- 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 9a54c7a2e8..c9dc301b8b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -19,7 +19,7 @@ if(WINDOWS) set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files SLVoice.exe - libsndfile-1.dll + libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll ortp.dll -- cgit v1.2.3 From 13180604e5752b8b5a98e049bc55028d68e71147 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" 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 --- indra/cmake/Copy3rdPartyLibs.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..428b151c11 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,7 +236,6 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so - libuuid.so.1 libssl.so.0.9.7 ) -- cgit v1.2.3 From bee60281847e0d073554b0cd31a080ecad3aa5d1 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 16 Sep 2010 14:54:23 -0400 Subject: SNOW-606 REVERT libuuid removal backing out patch from SNOW-606 as it breaks the build on our linux build machines. Can be re-applied when our build machines get an updated version of libuuid. --- 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 428b151c11..9900a8fb45 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,6 +236,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so + libuuid.so.1 libssl.so.0.9.7 ) -- cgit v1.2.3 From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/cmake/Copy3rdPartyLibs.cmake | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake old mode 100644 new mode 100755 -- 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 From c0d882fbff8b0bae584b25f57ebe614aeada6034 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Oct 2010 11:26:59 -0500 Subject: Updated colladadom. --- 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 7d227d3674..14c54d72ef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,7 +38,7 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll - libcollada14dom21.dll + libcollada14dom21-d.dll glod.dll ) -- cgit v1.2.3 From fefae4c63902e7db9d71d905bd1ab597fc3a0526 Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 4 Nov 2010 16:26:27 -0400 Subject: SH-396 WIP fix mac teamcity build for mesh-development making sure we're copying over the necessary 3rd party library in the packaging stage --- 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 37f540e157..9081752287 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -174,6 +174,7 @@ elseif(DARWIN) libllqtwebkit.dylib libndofdev.dylib libexception_handler.dylib + libcollada14dom.dylib ) # fmod is statically linked on darwin -- cgit v1.2.3 From 5e57352e1295d33cf9815800393212824d53bb75 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 18 Nov 2010 16:42:57 -0500 Subject: SH-350 SH-351 SH-355 FIX Several fixes for ARC Fixed the texture resolution calculation against the rounding errors we had before. Fixed the bug where linking prims changed the combined cost Fixed the bug where twisting was not computed properly Code reviewed by davep. --- indra/cmake/Copy3rdPartyLibs.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9081752287..798cf9af14 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -241,7 +241,6 @@ elseif(LINUX) libstacktrace.so libtcmalloc_minimal.so libtcmalloc_minimal.so.0 - libuuid.so.1 libssl.so.0.9.7 ) -- cgit v1.2.3 From 52f397ec7a0f0698ea24c05c1bd538ec17161714 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 18 Nov 2010 17:28:13 -0500 Subject: SH-350 SH-351 SH-355 FIX ARC fixes Had a few debugging lines in my last checkin. Cleaning up unreviewed changes. --- 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 798cf9af14..93cdf3422c 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -241,7 +241,8 @@ elseif(LINUX) libstacktrace.so libtcmalloc_minimal.so libtcmalloc_minimal.so.0 - libssl.so.0.9.7 + libuuid.so.1 + libssl.so.0.9.7 ) if (FMOD) -- cgit v1.2.3 From aafd7abd70396d33984b20c25d747406dea422ce Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 22 Nov 2010 16:44:58 -0500 Subject: SH-467 FIX fix of VWR-20809/SNOW-504 lost in merge re-applying the fix originally committed as c5ddd1e361ae. This allows standalone builds to not depend on stage_third_party_libs but was lost in a merge as referenced in jira. Re-reviewed the code in the patch and it is a valid fix. --- indra/cmake/Copy3rdPartyLibs.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 93cdf3422c..85bb281354 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -295,7 +295,7 @@ copy_if_different( ${vivox_src_dir} "${SHARED_LIB_STAGING_DIR_DEBUG}" out_targets - ${vivox_files} + ${vivox_files} ) set(third_party_targets ${third_party_targets} ${out_targets}) @@ -376,7 +376,9 @@ if(NOT EXISTS ${internal_llkdu_path}) endif (NOT EXISTS ${internal_llkdu_path}) -add_custom_target(stage_third_party_libs ALL - DEPENDS - ${third_party_targets} - ) +if(NOT STANDALONE) + add_custom_target( + stage_third_party_libs ALL + DEPENDS ${third_party_targets} + ) +endif(NOT STANDALONE) -- cgit v1.2.3 From d490081fe29adabfd3a2dba81f5e65d90db3fb51 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 8 Apr 2011 17:12:26 -0400 Subject: changes for newer collada build --- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake old mode 100644 new mode 100755 index a301a8d6ba..d4c478c3c7 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -39,7 +39,7 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll - libcollada14dom21-d.dll + libcollada14dom22-d.dll glod.dll ) @@ -51,7 +51,7 @@ if(WINDOWS) libapriconv-1.dll ssleay32.dll libeay32.dll - libcollada14dom21.dll + libcollada14dom22.dll glod.dll ) -- cgit v1.2.3 From 5f872761ca1dd676cfddea2bae08c1d6b1388f1e Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 8 Apr 2011 20:03:44 -0400 Subject: no longer using tcmalloc-minimal, replacing cmake config to refer to full build version. --- indra/cmake/Copy3rdPartyLibs.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index d4c478c3c7..38bfef6332 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -56,8 +56,8 @@ if(WINDOWS) ) if(USE_GOOGLE_PERFTOOLS) - set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) - set(release_files ${release_files} libtcmalloc_minimal.dll) + set(debug_files ${debug_files} libtcmalloc-debug.dll) + set(release_files ${release_files} libtcmalloc.dll) endif(USE_GOOGLE_PERFTOOLS) if (FMOD) @@ -262,7 +262,7 @@ elseif(LINUX) libopenal.so libopenjpeg.so libssl.so - libtcmalloc_minimal.so + libtcmalloc.so libuuid.so.16 libuuid.so.16.0.22 libssl.so.0.9.8 -- cgit v1.2.3 From 0e2df0277510fc05d6038838ddf283dbd2e5124e Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 11 Apr 2011 15:42:17 -0500 Subject: Attempt at making tcmalloc work. --- indra/cmake/Copy3rdPartyLibs.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 38bfef6332..d4c478c3c7 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -56,8 +56,8 @@ if(WINDOWS) ) if(USE_GOOGLE_PERFTOOLS) - set(debug_files ${debug_files} libtcmalloc-debug.dll) - set(release_files ${release_files} libtcmalloc.dll) + set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) + set(release_files ${release_files} libtcmalloc_minimal.dll) endif(USE_GOOGLE_PERFTOOLS) if (FMOD) @@ -262,7 +262,7 @@ elseif(LINUX) libopenal.so libopenjpeg.so libssl.so - libtcmalloc.so + libtcmalloc_minimal.so libuuid.so.16 libuuid.so.16.0.22 libssl.so.0.9.8 -- cgit v1.2.3 From 130db30b269a04bcf6b3a672056098cccb73efb0 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 18 Apr 2011 17:03:46 -0400 Subject: adding collada and minizip to the libraries we package the viewer with. --- indra/cmake/Copy3rdPartyLibs.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index d4c478c3c7..e42a013bde 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -249,6 +249,7 @@ elseif(LINUX) libaprutil-1.so.0 libatk-1.0.so libbreakpad_client.so.0 + libcollada14dom.so libcrypto.so.0.9.8 libdb-5.1.so libexpat.so @@ -259,6 +260,7 @@ elseif(LINUX) libgobject-2.0.so libgtest_main.so libgtest.so.0 + libminizip.so libopenal.so libopenjpeg.so libssl.so -- cgit v1.2.3 From 3cb97cb4d75c40d9519d796dd52d0741d354fc97 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 18 Apr 2011 18:48:43 -0400 Subject: restoring glod to copy3rdpartylibs.cmake and viewer_manifest.py --- 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 e42a013bde..8e185df191 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -254,6 +254,7 @@ elseif(LINUX) libdb-5.1.so libexpat.so libexpat.so.1 + libglod.so libgmock_main.so libgmock.so.0 libgmodule-2.0.so -- cgit v1.2.3 From d9c7c925dac3441cd2a05d0055e009693af5b087 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 20 Apr 2011 22:35:06 -0600 Subject: adding collada and minizip to the libraries we package the viewer with for mac. --- indra/cmake/Copy3rdPartyLibs.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/cmake/Copy3rdPartyLibs.cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 8e185df191..6c12dfb862 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -207,10 +207,12 @@ elseif(DARWIN) libapr-1.dylib libaprutil-1.0.dylib libaprutil-1.dylib + libcollada14dom.dylib libexpat.1.5.2.dylib libexpat.dylib libGLOD.dylib - libllqtwebkit.dylib + libllqtwebkit.dylib + libminizip.a libndofdev.dylib libexception_handler.dylib libcollada14dom.dylib -- cgit v1.2.3