summaryrefslogtreecommitdiff
path: root/indra/llcommon/CMakeLists.txt
AgeCommit message (Collapse)Author
2009-09-08Fix some linking problems for tests.Bryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-03QAR-1619: Fix Windows link errors when building INTEGRATION_TEST_lllazy.Nat Goodspeed
The problem arose because we were setting LL_COMMON_BUILD in llcommon/CMakeLists.txt, not only for the library build itself but also for its LL_ADD_INTEGRATION_TEST tests. This told all the headers compiled into the INTEGRATION_TEST_lllazy executable that the executable was providing all the llcommon symbols, rather than importing them. The solution is to switch to the llcommon_EXPORTS symbol automagically defined by CMake when building the llcommon shared library itself.
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Fix up some post-merge breakage.Bryan O'Sullivan
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> ↵Steven Bennetts
viewer-2.0.0-3 Includes: * DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips * DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor * Some cleanup to llerror so that it doesn't depend on llfixedbuffer * A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or more Linden libraries, or that should be executed with a wrapper script. Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-05Attemt at fixing "doubleton" problems across shared lib boundaries. ↵brad kittenbrink
Singletons now keep their SingletonInstaceData in a big global map in the llcommon module.
2009-08-04DEV-34837: Allow Mac SL executable to find libllcommon.dylib in app bundle'sNat Goodspeed
Resources subdir without requiring user to explicitly set DYLD_LIBRARY_PATH. Engage the SHARED_LIB_STAGING_DIR mechanism for Mac as well as Windows and Linux so unit-test executables, too, can find libllcommon.dylib. Perform the POST_BUILD copy of libllcommon.dylib to SHARED_LIB_STAGING_DIR everywhere but Windows -- but make it conditional on SHARED_LIB_STAGING_DIR.
2009-07-31Fix for DEV-35401 that makes the copy linux only and doesn't hurt mac buildPalmer Truelson
To be reviewed by Mani
2009-07-30Fixes to build on linux for DEV-35401.palmer@eniac54.lindenlab.com
Moves libllcommon.so to a staging dir for unit tests to work and gets rid of LL_COMMON_API in forward declarations
2009-07-15Disable SHARED_LIB_STAGING_DIR usage on systems where it's not initialized.brad kittenbrink
2009-07-10Expanded tabs in cmake filespalmer@945battery-guestB-224.lindenlab.com
2009-07-09Brad already added the LLCOMMON_LINK_SHARED definition. I removed the broken ↵Mark Palange (Mani)
one I added and set the other one to ON by default.
2009-07-09Defaulting LLCommonLinkShared to onPalmer
2009-07-09Moveing around DLL copying to support building llcommon.dll and using ↵Mark Palange (Mani)
llcommon.dll while running unit tests.
2009-06-30Fixes to let llcommon build as a .dylib. It depends on PTH library.brad kittenbrink
2009-06-26Moved LLAPRSockStream out of llcommon into eventhost module so I can ↵brad
reenable its tests in the new world order.
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
LLEventDispatcher and LLDispatchListener classes. See LLAresListener for example usage.
2009-06-10Added LLAPRSockStream class and associated LLAPRSockStreambuf class forBrad Kittenbrink
DEV-31978 viewer event host socket module. reviewed by palmer+nat+mani.
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-03DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutineNat Goodspeed
instances. LLCoros::launch() intends to address three issues: - ownership of coroutine instance - cleanup of coroutine instance when it terminates - central place to twiddle MSVC optimizations to bypass DEV-32777 crash. Initially coded on Mac; will address the third bullet on Windows. Adapt listenerNameForCoro() to consult LLCoros::getName() if applicable. Change LLLogin::Impl::connect() to use LLCoros::launch(). LLCoros::getName() relies on patch to boost::coroutines::coroutine::self to introduce get_id().
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-13svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 (finish)
2009-05-11svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-08svn merge -r114679:114681 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-09-02Don't link llcommon against iconv yet.Bryan O'Sullivan
2008-09-02QAR-842 / Port Mac build borkage fix to releaseBryan O'Sullivan
2008-08-29Use target_link_libraries for llcommonBryan O'Sullivan
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 15:03:36 +0000