edb999ab03
Remove tab chars inherited with file...
2010-06-21 17:02:16 -04:00
4e538adca4
EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.
...
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-21 12:18:16 -04:00
477fb26c1e
Centralize LD_LIBRARY_PATH logic with new SET_TEST_PATH macro.
...
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-18 17:38:21 -04:00
788c787ea7
Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior.
2010-06-11 18:56:18 -07:00
0bf02ad820
VPLAT-268: Update Mac for relative-path libexception_handler.dylib
...
Also add the dylib to Copy3rdPartyLibs.cmake so unit tests can find it.
2010-05-26 12:21:55 -04:00
637b1e4a3a
fix some dos line endings.
2010-05-24 16:24:10 -07:00
8be11be8e7
resolve merge conflict
2010-05-24 16:16:31 -07:00
28bff2cd99
Fix for mac build failing to find google_breakpad client libraries.
2010-05-24 15:42:22 -07:00
1077ab49c1
Just enough hackery to get minidumps into Wind'ohs crash reports. Code clean up needed.
2010-05-24 15:19:33 -07:00
d9fee67f97
VPLAT-237 Linux client library package for google_breakpad.
2010-05-21 19:09:53 -07:00
95d7aab108
New windows google_breakpad package with GUIDString class included in common.lib. I've confimred that llcommon links now.
2010-05-21 15:48:40 -07:00
fa06293a4c
Added call to use_prebuilt_binary for google-breakpad so it actually gets installed by install.py.
2010-05-21 11:48:07 -07:00
437d23710f
EXT-7004 : Select GCC 4.0 automatically as the compiler in Xcode with Cmake 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-04-22 16:09:54 +01:00
04712617c5
merge of viewer2 trunk and 'EXT-5601: Linux: volume adjustment of web-based media / Flash'
2010-02-22 17:10:47 +00:00
f43a9a181e
Do the necessary stuff to package pulseaudio's headers and make it (in theory, not yet in practice) optional.
2010-02-22 16:50:26 +00:00
fa9811e0c5
Fix Mac build with the renamed boost libs
2010-02-22 16:09:25 +00:00
1675dc02b5
make linux viewer build use the new boost lib names. :/
2010-02-20 14:27:51 +00:00
33a3a0d156
follow-up to previous fix - don't link to librt twice.
2010-02-17 14:31:02 +00:00
221885fc73
Hack librt inclusion into llcommon for all Linux builds. The dep is needed for llcommon, but it was being satisfied elsewhere for viewer builds and got to dodge the problem. This should quieten the server builds somewhat.
2010-02-17 14:29:56 +00:00
56ca1aebb8
remove linux linking stats from build process - I added them to help optimize linking time, but they're noisy and inaccurate in reality.
2010-02-04 11:40:33 +00:00
9430b8de65
dos2unix these files
2010-02-01 16:29:52 -08:00
1500e90ecc
Make sure mac build honors compile-time flag that en/disables OS drag and drop.
...
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
2010-01-08 15:11:03 -08:00
4d55b5bad0
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-18 14:25:15 -08:00
bff2f1d6f0
EXT-3140 and build performance enhancements.
...
Move the message_template check and manifest checking to the package step.
Moved the dll copy from a post-build step its own target for dependency checking.
Disabled copy of art/xui, etc in viewer manifest for non-package builds.
2009-12-15 14:19:33 -08:00
4a92f49e7b
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 09:28:47 -08:00
25a773d79c
DEV-43896 solve render-pipeline linux mesh gzopen64 problem
...
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08 11:39:44 -08:00
432bf69ad6
DEV-43897 linux viewer2 corrupted vorbis problem
...
we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
2009-12-08 08:56:13 +00:00
0a2a52c3b1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 11:55:43 -08:00
aae1917d2e
merge
2009-11-30 09:25:39 -08:00
dd6cfa8f98
Uncomment the run_build_test.py args to debug problem with coverity builds
2009-11-25 16:59:11 -08:00
0b9aa79570
merge
2009-11-23 17:20:08 -08:00
dd3c7a1a25
Fix for errors with integration tests failing to find libcrypto.so.0.9.7
2009-11-20 15:35:19 -05:00
0627d550f3
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/
2009-11-19 09:29:08 -08:00
9e53ad6111
Doh! Update the CMake file that controls drag and drop to turn it ON
2009-11-18 21:17:39 -08:00
4419e367bc
Add support for removing the Windows specific drag/drop code
...
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-18 21:15:44 -08:00
699eac4ee3
Switch some files to Unix line endings
2009-11-18 17:52:03 -08:00
8b56d0bece
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-18 12:02:04 -08:00
6b81dfb139
Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
...
Reviewed by Bao
2009-11-18 11:59:09 -08:00
67f11add9c
Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled pch usage for test executables. Reviewed by james and steve.
2009-11-13 20:30:54 -05:00
36ec149bef
Removed libtcmalloc_minimal.dll from the default build.
...
Reviewed by Palmer
2009-12-02 16:00:22 -08:00
5e11affddb
merge
2009-12-01 08:51:32 -08:00
ac8a710532
Merge the major new voice SDK version from Vivox ('mossbuild1')
2009-12-01 16:40:43 +00:00
dcc617fcf5
Made the gcc version number checking more robust in llaudio's
...
CMakeFiles.txt file. Previously it checked for a narrow range of gcc
versions via a regex:
if (${CXX_VERSION} MATCHES "4.[23]")
Now we explicit check for any version >= 4.2:
if (${CXX_VERSION_NUMBER} GREATER 419)
2009-11-30 18:42:45 +00:00
3858992603
Add CMake var LL_TESTS to optionally disable tests for build timing
2009-11-27 22:24:57 -08:00
1942e607f8
merge.
2009-11-26 09:47:00 +00:00
de92d5ce32
re-upgrade to vivox v3 sdk here.
2009-11-23 17:57:25 +00:00
59eb2815bf
merge
...
--HG--
branch : avatar-pipeline
2009-11-13 18:28:27 -05:00
b34ee7f9f4
merge
2009-11-11 12:21:23 -08:00
fedf86c216
fix wrapping of text segment containing multiple newlines and ending on a newline
...
reviewed by leyla
2009-11-11 12:01:57 -08:00
d57c20787a
Fix for mac failure in apr shared lib staging (Part of DEV-41724)
2009-11-10 14:04:05 -05:00
Nat Goodspeed