summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-09-27mergeDave Parks
2010-09-23Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-09-23SH-211 FIX update viewer-mesh branch to use new tcmalloc packageNyx (Neal Orman)
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
2010-09-23WIP make tcmalloc work on linux (JIRA pending)Nyx (Neal Orman)
First pass at integrating the linux version of tcmalloc. Code will be reviewed in a later commit before pushing.
2010-09-23SH-64 update GLOD on macNyx Linden
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.
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-20mergeDave Parks
2010-09-19Use tcmalloc for windows (gives auto-magical 16-byte alignment whenever ↵Dave Parks
needed, much faster than Visual C++ malloc).
2010-09-16MergeLeyla Farazha
2010-09-16SNOW-606 REVERT libuuid removalNyx (Neal Orman)
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.
2010-09-14CTS-231 WIP update mac and linux autobuild libraries for glod and convex decompNyx (Neal Orman)
Updating cmake to ensure that linux uses the non-stub version of convex decomp. Code reviewed by Falcon
2010-09-09mergeDave Parks
2010-09-09Enable minimal rebuild and incremental linking for RelWithDebInfo builds.Dave Parks
2010-09-08SNOW-606 FIX disable packaging of libuuidNyx (Neal Orman)
Patch taken from JIRA, committing locally to fix our project branch. Code reviewed by Nyx / Brad
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Automated merge with ↵Aimee Linden
file:///Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-01VWR-22759 : port of SNOW-667, Automatic language translation of chat messagesMerov Linden
2010-09-01Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-08-31mergeDave Parks
2010-08-31VWR-20911 FOLLOWUP fixed indentation (cmake files use spaces only)Boroondas Gupte
(transplanted from d02b22278d5b0a0386b3a7c25221b2069bc02963)
2010-08-31VWR-20911 FIXED CMake build arch detection is inaccurate and incompleteBoroondas Gupte (patch by Robin Cornelius)
Robin Cornelius' patch from http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch applied without fuzz: patching file indra/cmake/Variables.cmake Hunk #1 succeeded at 52 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that. (transplanted from a9132a63e4739965d65ddd58a7be9eabe4321c2a)
2010-09-17Merge in lenny workChristian Goetze (CG)
2010-09-15merged STORM-130 (a.k.a. VWR-22769, SNOW-737 Version agnostic libPNG linking)Boroondas Gupte
2010-09-13Include libexpat.so.1 in the list of libs to copy.Christian Goetze (CG)
2010-09-13Prepend passed in path arguments, except when they are system paths.Christian Goetze (CG)
2010-09-13Clean up the LD_LIBRARY_PATH list prior to re-assembling it into a string.Christian Goetze (CG)
2010-09-13Add debug output to "indra/cmake/run_build_test.py".Christian Goetze (CG)
2010-09-13VWR-22769 : libPNG linking: fixed the non standalone case so that we can ↵Merov Linden
keep things unchanged for those folks (libpng wise) while taking in changes making things easier for standalone builders
2010-08-29SNOW-737 FIXED Version agnostic libPNG linkingBoroondas Gupte
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff applied with fuzz 3: patching file indra/cmake/PNG.cmake Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines). patching file indra/llimage/llpngwrapper.cpp Hunk #1 succeeded at 215 (offset -2 lines). Hunk #2 succeeded at 363 (offset -2 lines). patching file indra/llimage/llpngwrapper.h Hunk #1 succeeded at 31 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that.
2010-08-27Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-08-26Disable edit-and-continue (makes breakpoints not work on occasion).Dave Parks
2010-08-26buildfix: fixing linux build to handle new SSE2 architectureNyx (Neal Orman)
code reviewed by davep and falcon
2010-08-26Add missing files from viewer-experimentalDave Parks
2010-08-26re-merge viewer-public. has a rough edge or two, but this is closer to the ↵Tofu Linden
snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-25Automated merge with https://hg.lindenlab.com/davep/viewer-experimentalDave Parks
2010-08-24Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries ↵Merov Linden
references, fixed llkdu cmake to simply point to lib and build
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24Automated merge with file:///home/moss/hg/tofu-viewer-publicTofu Linden
2010-08-22SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Techwolf Lupindo
2010-08-20VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in Standalone buildsAimee Linden
2010-08-19More line endings.Dave Parks
2010-08-19VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system ↵Aimee Linden
version of llqtwebkit
2010-08-19Integrate SIMD API from oreh/server-trunk-orehDave Parks
2010-08-19VWR-20810 (SNOW-503) Quote EXE_STAGING_DIR to prevent it failing with some pathsAimee Linden
2010-08-19VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a ↵Aimee Linden
standalone build.
2010-08-16SNOW-746: Finished Google BreakPad cmake for standaloneTechwolf Lupindo
(transplanted from 5a7ee78d029e973084e28d0d23a7233e0d976dca)
2010-08-13Automated merge with file:///Users/oz/Internal/viewer-developmentOz Linden
2010-08-13Reintroduce check for LLKDU source after downloading the prebuilt lib, to ↵Aimee Linden
avoid adding a build dependency on it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:32:58 +0000