summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2010-09-27MergeLeyla Farazha
2010-09-28merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Boroondas Gupte
2010-09-16MergeLeyla Farazha
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Automated merge with ↵Aimee Linden
file:///Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-01VWR-22759 : port of SNOW-667, Automatic language translation of chat messagesMerov Linden
2010-08-31VWR-20911 FOLLOWUP fixed indentation (cmake files use spaces only)Boroondas Gupte
(transplanted from d02b22278d5b0a0386b3a7c25221b2069bc02963)
2010-08-31VWR-20911 FIXED CMake build arch detection is inaccurate and incompleteBoroondas Gupte (patch by Robin Cornelius)
Robin Cornelius' patch from http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch applied without fuzz: patching file indra/cmake/Variables.cmake Hunk #1 succeeded at 52 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that. (transplanted from a9132a63e4739965d65ddd58a7be9eabe4321c2a)
2010-09-17Merge in lenny workChristian Goetze (CG)
2010-09-15merged STORM-130 (a.k.a. VWR-22769, SNOW-737 Version agnostic libPNG linking)Boroondas Gupte
2010-09-13Include libexpat.so.1 in the list of libs to copy.Christian Goetze (CG)
2010-09-13Prepend passed in path arguments, except when they are system paths.Christian Goetze (CG)
2010-09-13Clean up the LD_LIBRARY_PATH list prior to re-assembling it into a string.Christian Goetze (CG)
2010-09-13Add debug output to "indra/cmake/run_build_test.py".Christian Goetze (CG)
2010-09-13VWR-22769 : libPNG linking: fixed the non standalone case so that we can ↵Merov Linden
keep things unchanged for those folks (libpng wise) while taking in changes making things easier for standalone builders
2010-08-29SNOW-737 FIXED Version agnostic libPNG linkingBoroondas Gupte
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff applied with fuzz 3: patching file indra/cmake/PNG.cmake Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines). patching file indra/llimage/llpngwrapper.cpp Hunk #1 succeeded at 215 (offset -2 lines). Hunk #2 succeeded at 363 (offset -2 lines). patching file indra/llimage/llpngwrapper.h Hunk #1 succeeded at 31 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that.
2010-08-26re-merge viewer-public. has a rough edge or two, but this is closer to the ↵Tofu Linden
snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-24Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries ↵Merov Linden
references, fixed llkdu cmake to simply point to lib and build
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24Automated merge with file:///home/moss/hg/tofu-viewer-publicTofu Linden
2010-08-22SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.Techwolf Lupindo
2010-08-20VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in Standalone buildsAimee Linden
2010-08-19VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system ↵Aimee Linden
version of llqtwebkit
2010-08-19VWR-20810 (SNOW-503) Quote EXE_STAGING_DIR to prevent it failing with some pathsAimee Linden
2010-08-19VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a ↵Aimee Linden
standalone build.
2010-08-16SNOW-746: Finished Google BreakPad cmake for standaloneTechwolf Lupindo
(transplanted from 5a7ee78d029e973084e28d0d23a7233e0d976dca)
2010-08-13Automated merge with file:///Users/oz/Internal/viewer-developmentOz Linden
2010-08-13Reintroduce check for LLKDU source after downloading the prebuilt lib, to ↵Aimee Linden
avoid adding a build dependency on it.
2010-08-13Remove check for LLKDU source in the tree before downloading the pre-built lib.Aimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12correct license tags from "internal" to "viewergpl"Oz Linden
2010-07-06Merged from viewer-release after resolving conflictsDessie Linden
2010-06-30Fix for windows build breakage. Set WINVER and _WIN32_WINNT preprocessor ↵brad kittenbrink
definitions appropriately for using windows XP API calls.
2010-06-29VWR-8885 CMAKE build hard depends on artwork filesTofu Linden
Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly. Reviewed by Aimee.
2010-06-21Remove tab chars inherited with file...Nat Goodspeed
2010-06-21EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.Nat Goodspeed
Recent checkins introduced two different CMake macros SET_TEST_LIST (which returned a CMake list of PATH directory strings) and SET_TEST_PATH (which returned a single platform-appropriate PATH string). On Windows, whose path-separator character is ';', SET_TEST_PATH interacted badly with CMake: in CMake, a single string containing ';' characters is indistinguishable from a list of strings. Eliminate the return-single-string form, redirecting the name SET_TEST_PATH to the macro that returns a CMake list. Make LL_TEST_COMMAND expect a list value, prepending each directory string with run_build_test.py's -l switch.
2010-06-18Centralize LD_LIBRARY_PATH logic with new SET_TEST_PATH macro.Nat Goodspeed
Add ${SHARED_LIB_STAGING_DIR_RELEASE} to LD_LIBRARY_PATH for executing tests: otherwise Debug-build tests can't find (e.g.) the aprutil DLL, for which we don't build/package a debug variant. Leverage discovery that a CMake macro can accept a target variable name argument for LL_TEST_COMMAND macro.
2010-06-11Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with ↵brad kittenbrink
mac/linux and potentially improve EXT-7032 behavior.
2010-05-26VPLAT-268: Update Mac for relative-path libexception_handler.dylibNat Goodspeed
Also add the dylib to Copy3rdPartyLibs.cmake so unit tests can find it.
2010-05-24fix some dos line endings.Andrew A. de Laix
2010-05-24resolve merge conflictAndrew A. de Laix
2010-05-24Fix for mac build failing to find google_breakpad client libraries.brad kittenbrink
2010-05-24Just enough hackery to get minidumps into Wind'ohs crash reports. Code ↵Andrew A. de Laix
clean up needed.
2010-05-21VPLAT-237 Linux client library package for google_breakpad.brad kittenbrink
2010-05-21New windows google_breakpad package with GUIDString class included in ↵brad kittenbrink
common.lib. I've confimred that llcommon links now.
2010-05-21Added call to use_prebuilt_binary for google-breakpad so it actually gets ↵brad kittenbrink
installed by install.py.
2010-04-22EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake ↵Aimee Linden
2.8.1 GCC 4.0 will be selected as the compiler in Xcode if building against the OS X 10.4 SDK which is incompatible with GCC 4.2 Also made it possible to override the selected SDK from the configure line, by using something like: -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING='10.4' -DCMAKE_OSX_SYSROOT:PATH='/Developer/SDKs/MacOSX10.5.sdk' Reviewed by: Poppy.
2010-02-22merge of viewer2 trunk and 'EXT-5601: Linux: volume adjustment of web-based ↵Tofu Linden
media / Flash'
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 04:12:09 +0000