summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
AgeCommit message (Collapse)Author
2012-09-14Removed appearance utility from viewer source. Added appearance utility ↵Don Kjer
autobuild package.
2012-09-06Adding appearance utility packageDon 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-02Merge 3.3.3 release with Drano HTTP library at 3.3.0Monty Brandenberg
Big delta was converting the new texture debugger support code to the new library. Viewer manifest should probably get an eyeball before release.
2012-06-27merge up to 3.3.3-releaseOz Linden
2012-04-23Okay, imported the core-http library and got it compiling suspiciously easily.Monty Brandenberg
The unit/integration tests don't work yet as I'm still battling cmake/autobuild as usual but first milestone passed.
2012-01-20removed LLXUIXML libraryRichard Linden
moved LLInitParam, and LLRegistry to llcommon moved LLUIColor, LLTrans, and LLXUIParser to llui reviewed by Nat
2011-09-15add configuration for constructing doxygen documentationOz Linden
2011-09-13Always build indra/test, run if LL_TESTS is enabled. Removed python test run ↵Logan Dethrow
command since there are no python tests in the viewer.
2011-09-09Removed some spurious newlines that I introduced into CMakeLists.txt.Logan Dethrow
2011-06-29Got indra/test to build. Fails to run due to missing .so files.Logan Dethrow
2011-05-04Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake ↵brad kittenbrink
to skip unnecessary unpacking of already installed packages.
2011-03-03merge up from viewer-developmentOz Linden
2011-02-16STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has ↵Jonathan Yap
been used
2011-01-11remove develop.py and references to it (use autobuild instead)Andrew A. de Laix
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-11-22STORM-151 : Attempt to fix Windows static linking, simplified manifestMerov Linden
2010-11-01On Mac, require at least CMake 2.6.4 for an important bug fix.Nat Goodspeed
2.6.4 fixes a Mac bug in get_target_property(... "SLPlugin" LOCATION): before that version it returns "pathname/SLPlugin", whereas the correct answer is "pathname/SLPlugin.app/Contents/MacOS/SLPlugin". With 2.6.2, the Mac build breaks in a mysterious way. Changing this version requirement should clarify the solution.
2010-10-12merged SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txtBoroondas Gupte
2010-10-05SNOW-654 (follow up): adjusted comment line length after indentation has changedBoroondas Gupte
2010-10-04SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txtBoroondas Gupte (original fix by Techwolf Lupindo)
Daggified version of http://svn.secondlife.com/trac/linden/changeset/3431 (or of the SNOW-654 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
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-08-21svn merge -r130238:130240 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-11svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-02Clean up use of tutBryan O'Sullivan
2009-02-12Fix linux-crash-logger dependencyChristian Goetze
2009-02-11Fix viewer dependency to point to viewer-crash-logger-stripped instead of ↵Christian Goetze
viewer-crash-logger
2009-01-21Fix for broken builds for win_setup app. Reviewed by Brad.James Cook
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-20Add an "if (EXISTS ${VIEWER_PREFIX}win_setup)" to fix open source dropChristian Goetze
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-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-07-31Bump minimum cmake version to 2.4.8.Bryan O'Sullivan
2008-07-26CMake updates:Kyle McKay
1. Initial compatibility with CMake 2.6 (verified on Mac OS X, other platforms may need more work) 2. Ability to more easily debug problems fetching prebuilt libraries (./develop.py configure -DDEBUG_PREBUILT=1) 3. Compatibility with Mac OS X MacPorts/Fink installations by trying to find and use system python executable first
2008-07-03DEV-17460 updated the cmake SERVER variable init to work reliablyMark Palange
2008-06-23adding the fabled "server" and "viewer" targets everyone has been wishing ↵Paul Oppenheim
for. Reviewed by cg. not for a jira.
2008-06-16for "new lib install step is too slow!" problem mailed to cmake@. Reviewed ↵Paul Oppenheim
by bos and cg.
2008-06-03Let's see if this works better.Bryan O'Sullivan
2008-06-03Don't include copy_win_scripts if it does not exist.Bryan O'Sullivan
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