summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2009-03-02Clean up use of tutBryan O'Sullivan
2009-02-26Fixed check to ensure the tests file actually existsJim Purbrick
Actually coded by DaveH, reviewed by CG
2009-02-26Go a different route - do not include tut tests in open source builds and ↵Christian Goetze
conditionally exclude the cmake macro upon availability of the source files. Reviewed by Scouse
2009-02-25svn merge -r108815:112761 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 The biggest things in this are Scalable Space Servers and Maint-Server-6 QAR-1209 : SSS QAR-1295 : maint-server-6 Conflicts resolved by prospero: C scripts/farm_distribute C scripts/automated_build_scripts/build-linux.sh : resolved by prospero, mostly kept the merge-right version in the conflict, but there was one block of repeated code from earlier that I removed. C scripts/automated_build_scripts/build-mac.sh : kept merge-right C indra/llcommon/llversionserver.h : svn revert C indra/newsim/llsimparcel.h : kept *both*... working had "setArea", merge-right had exportStream and importStream C indra/newsim/llsimparcel.cpp : see llsimparcel.h C indra/newsim/lltask.h : working had LLTask derived also from LLScriptResourceConsumer, merge-right had LLTask dervied also from LLAgentPosition. To resolve conflict, derive from both. C indra/newsim/lllslmanager.h : kept merge-right (had an added comment) C indra/llmessage/llhttpnode.h : kept working (added the definition of method LLHTTPNode::extendedResult) C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp C indra/lscript/lscript_execute_mono/llscriptexecutemono.h : These two were resolved by si, in consultation with daveh I also had to add the following stubs to indra/newsim/tests/llgodkickutils_test.cpp in order to get it to compile: // LLScriptResourceConsumer interface methods in LLTask LLScriptResource::LLScriptResource() { } LLScriptResourcePool::LLScriptResourcePool() { } LLScriptResourcePool LLScriptResourcePool::null; LLScriptResourceConsumer::LLScriptResourceConsumer() { } LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; } const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; } bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; } bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; } bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; } void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { } S32 LLTask::getUsedPublicURLs() const { return 0; } void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2009-02-25Fix build of buffer_file with g++ 4.3Bryan O'Sullivan
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-22Revert one openal -> openal-soft replacement - reviewed by MossChristian Goetze
2008-12-21Carry through andrew's rename of openal to openal-soft into cmake, see if ↵Christian Goetze
that helps
2008-12-18Added Cmake test macrosDave Hiller
Changed simulator cmake to use the new macros
2008-12-05Don't link the simulator with iconv.dll on Windows.Kyle Ambroff
2008-12-05indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically ↵Kyle Ambroff
links with iconv.
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-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
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-12svn merge -c102054Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015 QAR-1016 joystick+spacenav improvements 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-10-29Added search path for Microsoft DirectX SDK (August 2008), the latest ↵James Cook
version. OK by Ambroff.
2008-10-28Allow use of Python 2.6, in case it's useful for OSS builds.Bryan O'Sullivan
2008-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-09QAR-907: svn merge -r 98908:98910 ↵Don Kjer
svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-09-24DEV-19146 / Don't hard-code Windows paths.Bryan O'Sullivan
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-05Fix dataserver build on OS X.Bryan O'Sullivan
2008-09-02QAR-842 / Port Mac build borkage fix to releaseBryan O'Sullivan
2008-08-29Switch more libraries over to target_link_librariesBryan O'Sullivan
2008-08-29Switch llimage and llxml to target_link_librariesBryan O'Sullivan
2008-08-29Use target_link_libraries for llaudioBryan O'Sullivan
2008-08-29Use target_link_libraries for llcommonBryan O'Sullivan
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-08-18fix for DEV-18488 - remove optimization for RelWithDebInfo for Darwin ↵Paul Oppenheim
builds. Not reviewed, mailed to cmake@. Pretty minor, not destructive. Also removing test lldatabase_tut on mac for DEV-14371 until theres a sane way to do connection checking. I could be wrong on this one.
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-08-08Added the latest directx sdk release (June 2008) to the list that cmake ↵Eric Tulla
searches for. -Reviewed by bos
2008-07-31DEV-18513: Simplify use of Boost libraries on OS X.Bryan O'Sullivan
Self-reviewed.
2008-07-31If we need Mono, but don't find it, then fail earlyBryan O'Sullivan
Self-reviewed.
2008-07-31DEV-18513 - Don't fail if we have no debug FMOD librariesBryan O'Sullivan
Reviewed by Poppy.
2008-07-31svn merge -r93014:93396 ↵Dave Hiller
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-26Remainder of CMake 2.6.0 compatibility fixes. CMake 2.4.7/2.4.8 or 2.6.0 ↵Kyle McKay
can now be used for Mac builds.
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-15Add code to support add_viewer_version_to_managerChristian Goetze
2008-07-10Check the actual version of the compiler we're going to use to compile the ↵Kyle McKay
sources to determine which options need to be added rather than the version of some other compiler on the system.
2008-07-07Add support for GRID:STRING in cmakeChristian Goetze
2008-07-03Including fontconfig in the viewer build. (Omitted before)Jennifer Leech
Fix for DEV-17484: package-grabber omits fontconfig
2008-07-03DEV-17460 updated the cmake SERVER variable init to work reliablyMark Palange
2008-07-03Fix for windows + develop.py: Use pscp on windows instead of scp.Jennifer Leech
This also requires a putty session to be created, same as we do for svn.
2008-07-02Removing status msg: "Could not find scp or pscp executable" for case when ↵Jennifer Leech
scp not on system. Clutters output, and is not really necessary.
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-27vivox is cleared for open source distributionJennifer Leech
removing conditional install reviewed by cg
2008-06-26svn merge -r89701:90677 ↵Jennifer Leech
svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 17:44:45 +0000