summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
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
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20Update to build on Xcode 6.0: WTH! how did this ever link?callum_linden
2014-10-17Update to build on Xcode 6.0: turn BACK ON warnings as errors for overloaded ↵callum_linden
virtuals [-Woverloaded-virtual] and fix up first (of many) files
2014-10-17Update to build on Xcode 6.0: turn OFF warnings as errors for overloaded ↵callum_linden
virtuals [-Wno-overloaded-virtual]
2014-10-17Update to build on Xcode 6.0: change name of prebuilt binary to match new ↵callum_linden
format in autobuild.xml (subnname-subname vs subname_subname)
2014-10-17Update to build on Xcode 6.0: first pass at CMake changes to get a build startedcallum_linden
2014-10-13fixes for cmake warnings about policy changes. could not fully test these ↵JJ Linden
changes
2014-10-10update autobuild.xml to point to new versions of boost, googlemock and ↵callum_linden
colladadom
2014-10-07Updates to point to lots of new third party libs and some small tweaks to ↵callum_linden
take account of minor name changes
2014-09-29upgrade packages for dbus_glib and libuuid to autobuild 1.0Oz Linden
2014-09-29remove chatty autobuild messageOz Linden
2014-09-29correct prebuild name for llappearance_utilityOz Linden
2014-09-29make cmake usage match new autobuild package nameOz Linden
2014-09-26use the value established by autobuild itself when finding autobuildOz Linden
2014-09-25correct openal package nameOz Linden
2014-09-24MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo ↵maksymsproductengine
LLTextBase::normalizeUri() issue: windows build fix
2014-09-24MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo ↵Savchenko Maksym
LLTextBase::normalizeUri() issue
2014-09-23minimal hacks to autobuild.xml to allow configure to finishOz Linden
2014-09-22MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser;maksymsproductengine
2014-08-11Doc cleanup. Unicode cruft, copy editing.Monty Brandenberg
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
2014-06-16Merge. Refresh from viewer-release after 3.7.9 release.Monty Brandenberg
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-05All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663.Monty Brandenberg
Linux: Include libQtXml and libQtSvg in manifest for libqsvg.so. More documentation thoughts for library package structure.
2014-06-05MergeRicky Curtice
2014-06-03All: Committing to llqtwebkit2 and the future. Updating all libraries.Monty Brandenberg
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom to 290576, curl to 290567, fontconfig to 290569, freetype to 290557, google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit to 290578, openssl to 290560, PCRE to 290406, zlib to 290556. Document compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake. It is the README for the building process based on things learned during this library project. Switch building process back to style used for new llqtwebkit2 repo. This builds shared libraries for Qt4 products on all platforms using current build machines and TC task templates. All platforms are building. All have comparable FPS rates. Builds are getting quieter. Forward, comrades!
2014-05-28Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.Monty Brandenberg
Release and Debug builds working. Remove the DOM_DYNAMIC define so that we don't create declspec declarations to colladadom objects and pull in libxml2_a (_a for archive) to complete the link. Debug functional and would be moreso if not for all the CrtCheckMemory() calls.
2014-05-28All: Update library SDL to 290309, c-ares to 290089, boost to 290191,Monty Brandenberg
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255, google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157, llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083, pcre to 290150, zlib to 290080. The freetype2 headers are now normalized to what they would normally be on a unix-type system. Libxml2 and pcre are available on all platforms. Libraries generally move in the direction of static archives rather than shared libraries (e.g. openssl). The llqtwebkit side is a step back from the more ambitious goal. What will be used (290262) will be a simple rebuild of the existing 4.7.1 library with updated package dependencies. The bigger work will be in the future.
2014-05-22Merge. Pull in viewer-release after release of 3.7.8Monty Brandenberg
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22catch a few more cases of STANDALONE -> USESYSTEMLIBSOz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-15Linux/Win: Bad checksum on Windows package. Libz and libpng linking ↵Monty Brandenberg
changes to find newest code. Windows autobuild package had a bad checksum due to oddities in the build system. On Linux I've been fighting with getting libz 1.2.8 and libpng 1.6.8 to be the definitive version in the viewer. Problem is the *massive* library search tree we assemble. We find older shared library versions first and so those dominated. By using --whole-archive with static libraries, the packaged versions of these libraries are made definitive.
2014-04-14All/Mac: Update libraries to new template builds. Package for static ↵Monty Brandenberg
libz/libpng/openssl. Update library dependencies to reference builds using new templates and modern build hosts for: SDL, c-ares, boost, curl, libpng, llqtwebkit2, openssl and zlib. Update manifest, library copying and 'test_apps' setup to reflect that zlib and openssl are now always static (on Mac and Linux). Viewer and test_apps now functional on 10.7 Mac.
2014-04-11Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.Monty Brandenberg
Part of the switchover to dynamic Qt4. This mostly completes the Mac side. Webkit is functional on Mac, plugins work. The two test programs, llfbconnectest and llplugintest, need a little more work to run without manual fixup ('.' on PATH and maybe a symlink to libz.1.dylib and they run and function on Mac). Also need to address libz.dylib vs libz.a. Currently resolving against dylib which is not what I want.
2014-04-09All/Linux: Update llqtwebkit to latest all-shared lib build. Linux packageMonty Brandenberg
assembly updated to deal with Qt libraries and discrete codec and imageformat plugins (which live under bin/llplugin). Functioning Linux viewer with MoaP support with a few image problems (sRGB profile, zlib errors). Much of this expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest forMonty Brandenberg
openssl on Mac (copy, deploy). Revert Linux manifest work which tried to work around 0555 permissions on .sos (and didn't work).
2014-04-04Linux: Finish new Boost dependencies to get Linux building again.Monty Brandenberg