summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2015-06-15Merge with head of viewer-releaseCallum Prentice
2015-06-12MAINT-2577 Fixed the status messageAndreyL ProductEngine
2015-06-12MAINT-5277 FIXED Viewer is missing MSVCP100.DLL and MSVCR100.DLLAndreyL ProductEngine
2015-06-10Changes to let CMake generate determine where the build files for OS X CEF ↵callum_linden
media plugin are
2015-06-08Fixed for OS X version - in progressCallum Prentice
2015-05-18Merge with Viewer Release (after Viewer Release updated with Viewer Tools ↵callum_linden
Update)
2015-03-26point to new cef tpl with right headers, update cmaake and viewer_manifest ↵callum_linden
logic to copy files to right place
2015-03-25Make VS2013 look inside include/cef folder for headerscallum_linden
2015-03-25Point to initial pass at a CEF package in autobuild and make sure autobuild ↵callum_linden
configure picks it up
2015-03-24Add new media plugin (currently renders squares as example) in preparation ↵callum_linden
for new CEF code
2015-03-24BUG-8786 - Turn off fast math opts enforcing IEEE 754 floating point complianceCinder
2015-03-24Refer to new QuickTime third party package with fixes for VS2013 & re-add ↵callum_linden
QuickTime media plugin
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-01-27Include MSVCP120.DLL and MSVCR120.DLL in Windows viewer package.Nat Goodspeed
Generalize Copy3rdPartyLibs.cmake to eliminate some clone-and-tweak redundancy.
2015-01-21Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-21Merge fix for copying Linux Vivox filesNat Goodspeed
2015-01-21Backed out changeset 1e36e0629994 copying .dylibs on LinuxNat Goodspeed
The .dylib files in the Linux Vivox package were erroneous to start with; while the affected changeset bypassed copy errors, it too was wrong. Now that the Linux Vivox package contains Linux .so files, revert to the correct filenames to copy.
2015-01-19Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-16Add flags to inject extra debugging information (via Sovreign Engineer)callum_linden
2015-01-08Rationalize use of AUTOBUILD environment variable across languages.Nat Goodspeed
Ensure that AUTOBUILD is always in native path syntax on every platform. Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh has set it properly, or scream for help. Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a local 'autobuild' variable using shell_path. Remove kludges in other languages involving cygdrive twiddling.
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
2014-12-22update libs to match vivox distributionOz Linden
2014-12-22merge latest trunk changesOz Linden
2014-12-19Merge backout of forcing DEBUG_PREBUILT setting.Nat Goodspeed
2014-12-19Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output.Nat Goodspeed
It appears that our trouble was due to a cygwin-style path in the AUTOBUILD environment variable, and that changeset 0e0bd8b546ad fixed it.
2014-12-19Defend against cygwin-style AUTOBUILD path in environment.Nat Goodspeed
2014-12-19Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC.Nat Goodspeed
2014-12-18merge latest changes for windowsOz Linden
2014-12-18allow signed vs unsigned compare in gccOz Linden
2014-12-17Update autobuild to point to new version of jsoncpp and change lib names to ↵callum_linden
match those in package
2014-12-17Update autobuild to point to new (VS2013) Havok files and fix up name mismatchcallum_linden
2014-12-17include Prebuilt.cmake before using macroOz Linden
2014-12-17Move the cmake package tracking files under the packages directoryOz Linden
2014-12-17merge up to latest changes from callum and natOz Linden
2014-12-17adjust cmake not to attempt loads of packages on the wrong platformsOz Linden
2014-12-17merge latest updates from nat and callumOz Linden
2014-12-17Produce error message, not traceback, when test program doesn't build.Nat Goodspeed
A traceback from a Python script always makes people think there's a bug in your script. Even when a test program fails to build, CMake often (always?) tries to run it anyway, via our run_build_test.py script. For that case, produce a straightforward error message -- rather than an OSError traceback that doesn't even mention the program name!
2014-12-15Add feature (enabled) to turn off media pluginscallum_linden
2014-12-15include quicktime package only on windowsOz Linden
2014-12-15include libuuid and fontconfig only on linuxOz Linden
2014-12-15don't include glext on Mac where it is not usedOz Linden
2014-12-12Make JsonCpp.cmake reference Windows lib names we actually use.Nat Goodspeed
2014-12-11Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.Nat Goodspeed
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every consumer must set /SAFESEH:NO. /NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
2014-12-04Make havok_source package name agree with name from repo URL.Nat Goodspeed
Until we get a havok-source package built with new metadata-bearing autobuild, the package name in autobuild.xml and CMake must agree with the tarball filename.
2014-11-21automate keeping the About SL -> Licenses tab correctOz Linden
2014-11-14Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2014-11-03Merge downstream code and become 3.7.20simon
2014-10-21correct test construction macro target reference for integration testsOz Linden
2014-10-21Update to build on Xcode 6.0: remove final, unwanted warningcallum_linden
2014-10-20Update to build on Xcode 6.0: Remove concept of XCODE_VERSION from CMake ↵callum_linden
files - we standardize on Xcode 6