summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-08-12Remove old linux_updater executable from source tree and CMake.Nat Goodspeed
2014-08-12Remove old Windows updater executable from source tree and CMake.Nat Goodspeed
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-04merging in viewer-chuiGilbert Gonzales
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-21added llfbconnecttest thanks to callumCho
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2013-03-06merge changes for DRTVWR-278Oz Linden
2013-03-05update minimum required version, and make it the same for all platformsOz Linden
2013-02-07derive version number from indra/VIEWER_VERSION.txtOz Linden
2013-01-05MAINT-2155: replace embedded mac-updater.app with a Python script.Nat Goodspeed
Remove mac-updater subtree from viewer source, along with the update_install bash script that invoked it. Remove all mention of mac-updater in CMakeLists.txt files and in viewer_manifest.py. Change Mac update_install bash script references in viewer_manifest.py and in llupdaterservice.cpp (which invokes it) to new Python update_install.py. Add update_install.py, messageframe.py (which puts up some Tkinter UI) and janitor.py (cloned from vita, it's exactly what we need here).
2012-10-04Building headless and non-headless libraries side-by-side, removing the need ↵Don Kjer
for the BAKING cmake setting.
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
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-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-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