summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
AgeCommit message (Collapse)Author
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