summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2011-05-18Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-05-16mergeDave Parks
2011-05-12mergeDave Parks
2011-05-09Merge.brad kittenbrink
2011-05-06Continuing work on CHOP-609 build time improvements. Fixed eroneous ↵brad kittenbrink
additional_INCLUDE_DIRS setting for unit tests.
2011-05-05Remove Pth library from viewer build.Nat Goodspeed
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK we're currently using directly supports the functionality for which we originally brought in Pth.
2011-05-05Merged latest lindenlab/viewer-development with ↵brad kittenbrink
brad_linden/viewer-mustbuildfaster-0.
2011-05-04Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake ↵brad kittenbrink
to skip unnecessary unpacking of already installed packages.
2011-05-04merge changes for open-61Oz Linden
2011-05-04Slightly improve sanity of run_build_test.py output.Nat Goodspeed
Flushing print buffer before running actual test executable should make it clearer which setup actions apply to which test run.
2011-05-03Fix for CHOP-619. Found a general solution to our vs2010 precompiled ↵brad kittenbrink
headers problems and eliminated all our special cases for handling them.
2011-05-02mergeDave Parks
2011-04-22mergeDave Parks
2011-04-22merge changes for storm-1187Oz Linden
2011-04-21mergeDave Parks
2011-04-21mergeDave Parks
2011-04-21OPEN-61 Adding locations that redistributable package installs msvc* files.Ima Mechanique
2011-04-20adding collada and minizip to the libraries we package the viewer with for mac.Xiaohong Bao
2011-04-20merge changes for storm-1183Oz Linden
2011-04-19New openssl package solves permissions problems with Linux build.Nat Goodspeed
The original Linux openssl tarball includes libcrypto.so and libssl.so files with r-xr-xr-x permissions: not even the owning user can modify them. This causes problems when the Release build tries to 'strip' the viewer and all associated libraries. Newer openssl tarball fixes permission problems. The newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P Presumably the only reason this hasn't been causing trouble with TC builds is that the link has been picking up system libraries instead of the ones from the openssl package.
2011-04-18restoring glod to copy3rdpartylibs.cmake and viewer_manifest.pyNyx (Neal Orman)
2011-04-18Fixed debug information format for mac to allow breakpoints to work under Xcode.Leslie Linden
2011-04-18Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010Nyx (Neal Orman)
2011-04-18adding collada and minizip to the libraries we package the viewer with.Nyx (Neal Orman)
2011-04-18more fix for the libminizip issue for linux.Xiaohong Bao
2011-04-14fixed windows boost library namesBrad Payne (Vir Linden)
2011-04-11Attempt at making tcmalloc work.Dave Parks
2011-04-08no longer using tcmalloc-minimal, replacing cmake config to refer toNyx (Neal Orman)
full build version.
2011-04-08changes for newer collada buildBrad Payne (Vir Linden)
2011-04-06Trying to fix missing python exe problemBrad Payne (Vir Linden)
2011-04-06mergeBrad Payne (Vir Linden)
2011-04-06Updated llconvexdecomposition library buildBrad Payne (Vir Linden)
2011-04-06OPEN-58 Ditch GL package for glext.h package since glut.h isn't used ↵Dave Parks
anywhere. Probably don't need glext headers for mac or linux as they come in with system updates.
2011-04-06OPEN-50 (partial): refactor cmake switches to common configurations and ↵Oz Linden
default values
2011-04-05initial pass at adding new mesh libraries to autobuild. Needs a license ↵Nyx (Neal Orman)
review and some other fixes, but autobuild configure completes successfully.
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-04-03merge changes for OPEN-39Oz Linden
2011-04-01pull latest changes from viewer-developmentOz Linden
2011-03-31Apply server side code to message template verification onto the viewer tree.Christian Goetze (CG)
2011-03-31MergeKelly Washington
2011-03-31d'oh, forgot to add back some q libs to the build when reverting to older ↵Andrew de Laix
linux package; here they are.
2011-03-30remove lib requirement not in current llqtwebkit linux archive.Andrew de Laix
2011-03-23Updated linux llqtwekit archive and fixed media webkit build and loading ↵alain@945battery-guestA-183.lindenlab.com
(fix CHOP-545).
2011-03-19merged OPEN-39: include Tut.cmake for integration tests (fixes ↵Boroondas Gupte
"bitpack_test.o: No such file or directory" on standalone)
2011-03-19OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No ↵Boroondas Gupte
such file or directory" on standalone)
2011-03-18Autobuild : Fix merge snaffu in Json cmake fileMerov Linden
2011-03-18STORM-1023, STORM-1022 : pull into viewer-autobuild2010Merov Linden
2011-03-18Autobuild: pull in from jenn_linden/viewer-vs2010Merov Linden
2011-03-18Removal of dbghelp cruft.brad kittenbrink
Reviewed by alain and nat.
2011-03-18merge out 2.6.0 changes from viewer-developmentOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 14:23:19 +0000