summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2011-04-05MergeDave SIMmONs
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
2011-03-17Pull in merov_linden/viewer-autobuild2010Merov Linden
2011-03-16Pull from jenn_linden/viewer-vs2010Merov Linden
2011-03-16rename google archive for linux to google-perftools and update to latest.Andrew de Laix
2011-03-15update uuid archive for linux.Andrew de Laix
2011-03-15Pull from jenn_linden/viewer-vs2010Merov Linden
2011-03-15update jsoncpp archive on linux.Andrew de Laix
2011-03-14Fix Mac Json cmake scriptMerov Linden
2011-03-14update openssl archive for linux.Andrew de Laix
2011-03-14update llqtwebkit usage.Andrew de Laix
2011-03-14Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-11STORM-1073 : pull into viewer-developmentMerov Linden
2011-03-11update libpng archive for linux.Andrew de Laix
2011-03-11update fontconfig archive for linux.Andrew de Laix
2011-03-10remove ELFIO cruft; no longer needed now that we use google breakpad.Andrew de Laix
2011-03-10update dbusglib archive for linux.Andrew de Laix
2011-03-10update boost archive usage for linux.Andrew de Laix
2011-03-10update apr and sdl archives for linux; added new archive db (needed for ↵Andrew de Laix
linux only).
2011-03-07update openSSL archive usage for darwin.Andrew A. de Laix
2011-03-07update libpng and jpeglib archives for mac.Andrew A. de Laix
2011-03-04STORM-1023 : allow non standalone and non install prebuilt to use local fmod ↵Merov Linden
package path in autobuild.xml
2011-03-04ares, boost, expat, freetype archives updated to latest builds.Andrew A. de Laix
2011-03-03Add early exit to message template check if it hasn't changed.Kelly Washington
2011-03-03merge from lindenlab/viewer-developmentAlain Linden
2011-03-02revert to old jsoncpp library on linux to fix build.Andrew de Laix
2011-03-01Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-03-01fixes to get openal working on windows.Alain Linden
2011-03-01fix some mac build problems with library name changes with new packaages.Andrew A. de Laix
2011-02-24STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu changes ↵Merov Linden
: cmake changes making possible to use Findxxx when INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts around INSTALL_PROPRIETARY, add fmodex to FindFMOD
2011-02-24Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Jennifer Leech
2011-02-24integrate xmlrpc-epi into windows build.Alain Linden
2011-02-21Changes windows build and PNG cmake to reflect latests libpng buildssquire
2011-02-18Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-17Autobuild: fix for Mac build using XCodeMerov Linden
2011-02-17merge changes for storm-937Oz Linden