summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-04-23merge from viewer-trunkTofu Linden
2010-04-22EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake ↵Aimee Linden
2.8.1 GCC 4.0 will be selected as the compiler in Xcode if building against the OS X 10.4 SDK which is incompatible with GCC 4.2 Also made it possible to override the selected SDK from the configure line, by using something like: -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING='10.4' -DCMAKE_OSX_SYSROOT:PATH='/Developer/SDKs/MacOSX10.5.sdk' Reviewed by: Poppy.
2010-02-22mergePalmer Truelson
2010-02-22merge of viewer2 trunk and 'EXT-5601: Linux: volume adjustment of web-based ↵Tofu Linden
media / Flash'
2010-02-22Do the necessary stuff to package pulseaudio's headers and make it (in ↵Tofu Linden
theory, not yet in practice) optional.
2010-02-22Fix Mac build with the renamed boost libsAimee Linden
2010-02-20viewer2 mergeTofu Linden
2010-02-20make linux viewer build use the new boost lib names. :/Tofu Linden
2010-02-17mergeDave Parks
2010-02-17Post-review cleanup.Dave Parks
2010-02-17merge from viewer2.Tofu Linden
2010-02-17Switched program database on windows to edit and continue for non-release ↵Dave Parks
builds. Adding a debug watch to LLCurlRequest to avoid invalidating iterator on processing posts. Mesh bulk uploading rewrite work in progress. 404 icons for mesh assets.
2010-02-17follow-up to previous fix - don't link to librt twice.Tofu Linden
2010-02-17Hack librt inclusion into llcommon for all Linux builds. The dep is needed ↵Tofu Linden
for llcommon, but it was being satisfied elsewhere for viewer builds and got to dodge the problem. This should quieten the server builds somewhat.
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-08Switching to 10.5 SDKDave Parks
2010-02-04merge from viewer2.Tofu Linden
2010-02-04remove linux linking stats from build process - I added them to help ↵Tofu Linden
optimize linking time, but they're noisy and inaccurate in reality.
2010-02-03merge from viewer2.Tofu Linden
2010-02-01dos2unix these filesRick Pasetto
2010-01-29got rid of tabPalmer
2010-01-29Added glod.txt and libraries no longer unzipped into newviewPalmer
2010-01-08Make sure mac build honors compile-time flag that en/disables OS drag and drop.Rick Pasetto
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
2009-12-18Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-15EXT-3140 and build performance enhancements.Mark Palange (Mani)
Move the message_template check and manifest checking to the package step. Moved the dll copy from a post-build step its own target for dependency checking. Disabled copy of art/xui, etc in viewer manifest for non-package builds.
2009-12-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2009-12-08merge.Tofu Linden
2009-12-08DEV-43896 solve render-pipeline linux mesh gzopen64 problemTofu Linden
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08Grabbed more viewer 2 changes that should fix parabuild problemPalmer
2009-12-08 DEV-43897 linux viewer2 corrupted vorbis problemTofu Linden
we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
2009-12-07Merge of viewer 2 changesPalmer
2009-12-03Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-30mergeRick Pasetto
2009-11-25Uncomment the run_build_test.py args to debug problem with coverity buildsCG Linden
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-23mergeRick Pasetto
2009-11-20Fix for errors with integration tests failing to find libcrypto.so.0.9.7brad kittenbrink
2009-11-19Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/Rick Pasetto
2009-11-18Doh! Update the CMake file that controls drag and drop to turn it ONcallum
2009-11-18Add support for removing the Windows specific drag/drop codecallum
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-18Switch some files to Unix line endingsBryan O'Sullivan
2009-11-18Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-18Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory managerPalmer
Reviewed by Bao
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled ↵brad kittenbrink
pch usage for test executables. Reviewed by james and steve.
2009-12-02Removed libtcmalloc_minimal.dll from the default build.Mark Palange (Mani)
Reviewed by Palmer
2009-12-01mergeJames Cook
2009-12-01Merge the major new voice SDK version from Vivox ('mossbuild1')Tofu Linden
2009-11-30Made the gcc version number checking more robust in llaudio'sLynx Linden
CMakeFiles.txt file. Previously it checked for a narrow range of gcc versions via a regex: if (${CXX_VERSION} MATCHES "4.[23]") Now we explicit check for any version >= 4.2: if (${CXX_VERSION_NUMBER} GREATER 419)