summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-14SH-329 WIP merging in oz's fix for license issues in the mesh branchNyx (Neal Orman)
2010-10-14Updated colladadom.Dave Parks
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-07SH-65 WIP update convex decomp on macNyx Linden
Pushing in the cmake change that will make the mac build use the non-stub version of the convex decomp lib.
2010-10-01disable incremental linking by default as per vir's request.Dave Parks
2010-10-15MergeLeyla Farazha
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-10-14Merge from http://hg.secondlife.com/viewer-identity (display names)Leyla Farazha
2010-10-13Automated merge with ↵Oz Linden
ssh://bitbucket.org/merov_linden/viewer-development-storm-137
2010-10-12Allow the passing of addational fmod lib names via FMOD_NAMES from the build ↵Techwolf Lupindo
envorment. This will allow one to pass via command line custom fmod lib names. ie: -DFMOD_NAMES:STRING:"fmod-4.44"
2010-10-12Clean up and rework FMOD.cmake and FindFMOD.cmakeTechwolf Lupindo
FMOD.cmake: Move include(Prebuilt) to prebuilt section. It is only used for prebuilt anyway. set(FMOD_FIND_REQUIRED ON) due to FMOD variable is use elsewhere in cmake files. This behaviour is the same as openal. Remove redudent error messages and code due to above. Rework the logic to be more cleaner. Clean up whitespace. FindFMOD.cmake Remove redudent paths as cmake allready uses them as default. Use PATH_SUFFIXES instead. The above will result in cmake looking in a lot more places and can handle custom build setups better. Change FMOD to FMOD_FOUND. FMOD should not be change withen cmake. Whitespace cleanup.
2010-10-12merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH ↵Boroondas Gupte
for unit tests)
2010-10-12SNOW-756 / VWR-23385 FOLLOWUP fixed indentationBoroondas Gupte
2010-10-12SNOW-756 / VWR-23385 FIXED standalone LD_LIBRARY_PATH for unit testsBoroondas Gupte (patch by Aleric Inglewood)
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff patching file indra/cmake/LLAddBuildTest.cmake Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line). Added entry in doc/contributions.txt. No further changes. originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
2010-10-07Pull update from viewer-developmentMerov Linden
2010-10-02STORM-137 : Build script modif so that Windows build does not rely on ↵Merov Linden
fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
2010-09-30Switch to 10.5 SDKDave Parks
2010-09-29MergeLeyla Farazha
2010-09-29merged SNOW-746: Finished Google BreakPad cmake for standaloneBoroondas Gupte
2010-09-27MergeLeyla Farazha
2010-09-28merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Boroondas Gupte
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 18:14:37 +0000