summaryrefslogtreecommitdiff
path: root/indra/cmake/CMakeLists.txt
AgeCommit message (Collapse)Author
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-03-24Add new media plugin (currently renders squares as example) in preparation ↵callum_linden
for new CEF code
2015-03-24Refer to new QuickTime third party package with fixes for VS2013 & re-add ↵callum_linden
QuickTime media plugin
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
2014-09-22MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser;maksymsproductengine
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17fix for missed merge changescallum_linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2012-10-24Switching to system osmesa library instead of pre-packaged libraryDon Kjer
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
2012-09-04Cleanup actions from code review of llappearance with nyxDon Kjer
2012-08-21SH-3261 SH-3324 WIP Starting extraction of wearable/appearance librariesNyx (Neal Orman)
First pass at cmake configs, and starting to try to move wearable class. Things are broken, checkpointing work to collaborate.
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-02-10- fixed : Hunspell linking issuesKitty Barnett
2012-01-25PATH-192 WIP adding convex decomp to pathingNyx (Neal Orman)
First pass at using new llPhysicsExtensions library which combines pathing and convex decomp.
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-10remove ELFIO cruft; no longer needed now that we use google breakpad.Andrew de Laix
2011-02-07there is no mt for vs2010Alain Linden
2011-01-11remove develop.py and references to it (use autobuild instead)Andrew A. de Laix
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-20VWR-24261: Configuration with cmake 2.8 is extremely slowAleric Inglewood
Add non-broken FindZLIB.cmake.
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-15MergeLeyla Farazha
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-06-24Fixed cmake to grab the decomposition libraries.Matthew Breindel (Falcon)
2010-06-14Builds with LLConvexDecompInter as a static lib.Dave Parks
2009-10-26Beginning work for DEV-41722 normalizing shared lib staging on all 3 ↵brad kittenbrink
platforms. Renamed CopyWinLibs.cmake to Copy3rdPartyLibs.cmake.
2009-09-08QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.Nat Goodspeed
Because the details of RunBuildTest.cmake versus run_build_test.py had to be changed in so many different places, introduce LL_TEST_COMMAND CMake macro (in LLTestCommand.cmake) to encapsulate construction of the actual command line. Use LL_TEST_COMMAND in LL_ADD_PROJECT_UNIT_TESTS, LL_ADD_INTEGRATION_TEST, the big indra/test monolith and the various LslCompilerMacros. Fix run_build_test.py to pass through the test executable's own options (e.g. --touch, --output) without inspection. Defend it against the case when the platform-specific library path environment variable doesn't yet exist. Make it report errors only on nonzero test-program rc. Remove RunBuildTest.cmake.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-03-09svn merge -r113780:113785Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732 QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST improvements - combo merge
2009-03-02Clean up use of tutBryan O'Sullivan
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge ↵James Cook
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-07Merged into release with command:Kartic Krishnamurthy
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-07-31svn merge -r93014:93396 ↵Dave Hiller
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-06-24Update to remove the warnings about WindowsDevLibsCopy.cmake from previous ↵Mark Palange
commit (DEV-16646)
2008-06-24DEV-16646 second-life post build silently fails. Instead of post build, ↵Mark Palange
there's a new target - copy-win-libs. Removed python dependecy from the copy Reviewed by bos
2008-06-21svn merge -r90150:90340 ↵Kyle Ambroff
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586 * QAR-687 - Test build with libs on S3 * QAR-637 Test dynamic sound throttle * QAR-586 Test new http features branch
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers