summaryrefslogtreecommitdiff
path: root/indra/cmake/APR.cmake
AgeCommit message (Collapse)Author
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2011-03-04ares, boost, expat, freetype archives updated to latest builds.Andrew A. de Laix
2011-01-13mac buiding with autobuild and autobuild style packages (just say no to ↵Andrew A. de Laix
install.py)
2010-02-17follow-up to previous fix - don't link to librt twice.Tofu Linden
2010-02-17Hack librt inclusion into llcommon for all Linux builds. The dep is needed ↵Tofu Linden
for llcommon, but it was being satisfied elsewhere for viewer builds and got to dodge the problem. This should quieten the server builds somewhat.
2009-07-30DEV-34837: Improve Mac support for LLCOMMON_LINK_SHARED.Nat Goodspeed
Update Mac apr_suite package, introducing libapr-1.0.3.7.dylib and libaprutil-1.0.3.8.dylib. We want to use dynamic APR libraries, but libllcommon.dylib isn't allowed to depend on .so libraries: must be .dylibs themselves. Tweak APR.cmake to reference the aforementioned .dylibs when on Mac with LLCOMMON_LINK_SHARED set. Eliminate some redundancy in Windows section. For .dylibs, RunBuildTest.cmake must set DYLD_LIBRARY_PATH: LD_LIBRARY_PATH only affects search for .so files. PENDING: CMake dependencies broken? With LLCOMMON_LINK_SHARED on, it seems we need to build libllcommon.dylib explicitly before full build can succeed. This snapshot does NOT yet copy the llcommon, apr or aprutil dylibs into the app bundle.
2009-07-02Windows now links to shared apr when LLCOMMON_LINK_SHARED is on.brad kittenbrink
2009-04-30svn merge -r118008:118374 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 QAR-1459 etch builds enabled
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2008-12-05Don't link the simulator with iconv.dll on Windows.Kyle Ambroff
2008-12-05indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically ↵Kyle Ambroff
links with iconv.
2008-11-07Merged into release with command:Kartic Krishnamurthy
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
2008-09-02QAR-842 / Port Mac build borkage fix to releaseBryan O'Sullivan
2008-07-26Remainder of CMake 2.6.0 compatibility fixes. CMake 2.4.7/2.4.8 or 2.6.0 ↵Kyle McKay
can now be used for Mac builds.
2008-06-12svn merge -r89258:89534 ↵Jennifer Leech
svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
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