summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-11-17Merge with viewer-developmentBryan O'Sullivan
2010-11-17It is safe to use Python 2.7 on Windows, if presentBryan O'Sullivan
2010-11-17Update slvoice dependency for WindowsBryan O'Sullivan
2010-11-16Replace template verification code with an md5sum check.Christian Goetze (CG)
2010-10-27SH-392 Port over fix from mesh-development for FBOs on OSXDave Parks
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
2010-10-16VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
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-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-16MergeLeyla Farazha
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-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-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-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-19VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system ↵Aimee Linden
version of llqtwebkit
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 16:50:28 +0000