summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08merge changes for DRTVWR-250Oz Linden
2012-12-20Disabling build of headless appearance utilityDon Kjer
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-12Updating linux libGLOD to match darwin namingDon Kjer
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2012-12-11Fix for building on case-sensitive mac filesystems. Fix to remove unwind ↵Don Kjer
spam warnings while linking on xcode 4.5.2 builds
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-06On Linux now use the default system python instead of defaulting to ↵Logan Dethrow
python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19MAINT-1841 Fix for mac/linux buildDave Parks
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-13Stupid typo in Boost Cmake filecallum_linden
2012-11-13Update Windows lib names for new Boost packagecallum_linden
2012-11-12First round of fixes to make viewer work with Boost 1.52callum_linden
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2013-02-20add viewer channel to compile time feedbackOz Linden
2013-02-12convert to new channel name scheme and remove login_channel build time parameterOz Linden
2013-02-07derive version number from indra/VIEWER_VERSION.txtOz Linden
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24Switching to system osmesa library instead of pre-packaged libraryDon Kjer
2012-10-22Enable tcmallocDave Parks
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-10-17Fix for headless appearance utility not linking correctlyDon Kjer
2012-10-15Speeding up cmake configuration, especially on linux. Re-arranged ↵Don Kjer
llrender/llwindow cmake source a bit
2012-10-13Adding libdl to OSMesa16 link lineDon Kjer
2012-10-11Adding multi-arch hints to CMake, allowing it to correctly find libraries on ↵Don Kjer
multi-arch debian-based systems.
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-04Updating to newer build of tcmalloc/google perf tools. Removing X11 library ↵Don Kjer
dependencies from headless libraries
2012-10-04Limiting headless builds to linuxDon Kjer
2012-10-04Building headless and non-headless libraries side-by-side, removing the need ↵Don Kjer
for the BAKING cmake setting.