summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2012-11-26Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-21Fixing build issues with tcmalloc disabled.William Todd Stinson
2012-11-20merge changes for DRTVWR-246Oz Linden
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-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.
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-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-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply 4a8388c13e56: MAINT-646 Enable /fp:fast in Visual StudioDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-08More optional signing stuff for 10.5Aura Linden
2012-08-08Pulled merge, changed . to , in viewer-manifestAura Linden
2012-08-08More optional config for 10.5 buildsAura Linden
2012-08-06Removed (unworking) code signing parameters from autobuild (wrong place)callumprentice
Added them to correct place (Cmake config)
2012-08-03Merge of viewer-development (3.4.1).Monty Brandenberg
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-25Fix to build with code signing option (patch from STORM-1900)callum_linden
2012-07-24merge up to latest viewer-pathfinding (including 3.3.4)Oz Linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23Make build dependent on version of xcode, not version of OSX for DARWINAura Linden
2012-07-23Changed CMake to work for older and newer versions of OSXAura Linden
2012-07-21fix finding havok libs in relwithdebinfo mode (uses release unless ↵Oz Linden
LL_DEBUG_HAVOK is used
2012-07-20refactor to build llphysicsextensions_tpv package for sublicenseesOz Linden
2012-07-18cmake changes for OSX 10.7Aura Linden
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no ↵Matthew Breindel (Falcon)
longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK
2012-07-11Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to ↵Matthew Breindel (Falcon)
enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug