livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/cmake
History
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
 		2012-01-17 17:57:52 +01:00
..
00-Common.cmake Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
APR.cmake MacOSX Lion build compatibility & adjustments, adapted from Mimika Oh 2011-08-14 12:08:44 -04:00
Audio.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
BerkeleyDB.cmake update apr and sdl archives for linux; added new archive db (needed for linux only). 2011-03-10 00:48:20 +00:00
Boost.cmake update boost archive usage for linux. 2011-03-10 17:53:15 +00:00
BuildVersion.cmake Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
CARes.cmake fix some mac build problems with library name changes with new packaages. 2011-03-01 13:13:05 -08:00
CMakeCopyIfDifferent.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
CMakeLists.txt Adding basic support for hacd 2011-10-02 10:27:42 -04:00
CSharpMacros.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
CURL.cmake backporting from v2.5 STORM-453 (update libcurl to 7.21.1) with the exception for linux do to STORM-809 not yet fixed. This fixes logins with proxy connections. 2011-01-23 15:32:46 -08:00
Copy3rdPartyLibs.cmake Merge up to LL FUI 2011-10-28 02:00:09 -04:00
CopyBackToSource.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
DBusGlib.cmake update dbusglib archive for linux. 2011-03-10 21:51:13 +00:00
DeploySharedLibs.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
DirectX.cmake updated DX cmake for newer versions (feb and june 2010) 2011-09-25 23:31:20 -07:00
DragDrop.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
EXPAT.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
ExamplePlugin.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Externals.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FMOD.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
FindAPR.cmake Look for the OS X SDK version of libapr before the system version, to allow building on Lion (10.7) for a Leopard (10.5) target. 2011-11-24 08:48:03 -06:00
FindAutobuild.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
FindBerkeleyDB.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindCARes.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindELFIO.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindFMOD.cmake STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu changes : cmake changes making possible to use Findxxx when INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts around INSTALL_PROPRIETARY, add fmodex to FindFMOD 2011-02-24 20:57:34 -08:00
FindGLH.cmake OPEN-38: Fixes for viewer-autobuild for standalone 2011-04-03 14:34:44 +02:00
FindGLOD.cmake Add standalone glod support. 2011-11-06 21:07:54 -05:00
FindGoogleBreakpad.cmake SNOW-746: Finished Google BreakPad cmake for standalone 2010-08-16 22:10:18 -04:00
FindGooglePerfTools.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindHACD.cmake Sanitize HACD.cmake and FindHACD.cmake. Use HACD_INCLUDE_DIR in all files; do not search for hacdHACD.h, that files is not needed to compile the viewer. 2011-10-27 23:56:19 +02:00
FindHUNSPELL.cmake - internal : Mac and Linux packages for Hunspell (courtesy of Arrehn) 2011-09-23 23:02:00 +02:00
FindJsonCpp.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
FindLLQtWebkit.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
FindMT.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindMono.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindMySQL.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindNDOF.cmake VWR-10579: Fix NDOF.cmake to do the right thing on standalone. 2010-12-15 22:44:21 +01:00
FindOpenJPEG.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindSCP.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindSVN.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindXmlRpcEpi.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
FindZLIB.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
FreeType.cmake mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
GLH.cmake OPEN-38: Fixes for viewer-autobuild for standalone 2011-04-03 14:34:44 +02:00
GLOD.cmake Add standalone glod support. 2011-11-06 21:07:54 -05:00
GStreamer010Plugin.cmake mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
GetPrerequisites_2_8.cmake STORM-826 (workaround): correct mixed and dos-style line endings 2011-01-06 11:06:20 -05:00
Glui.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Glut.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
GoogleBreakpad.cmake merged SNOW-746: Finished Google BreakPad cmake for standalone 2010-09-29 12:57:32 +02:00
GoogleMock.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
GooglePerfTools.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
HACD.cmake Sanitize HACD.cmake and FindHACD.cmake. Use HACD_INCLUDE_DIR in all files; do not search for hacdHACD.h, that files is not needed to compile the viewer. 2011-10-27 23:56:19 +02:00
Hunspell.cmake - internal : Mac and Linux packages for Hunspell (courtesy of Arrehn) 2011-09-23 23:02:00 +02:00
JPEG.cmake update libpng and jpeglib archives for mac. 2011-03-07 11:44:51 -08:00
JsonCpp.cmake Autobuild : Fix merge snaffu in Json cmake file 2011-03-18 16:47:43 -07:00
LLAddBuildTest.cmake Continuing work on CHOP-609 build time improvements. Fixed eroneous additional_INCLUDE_DIRS setting for unit tests. 2011-05-06 14:51:50 -07:00
LLAudio.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLCharacter.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLCommon.cmake VWR-24254: Add support for using ld.gold on linux. 2010-12-15 20:55:10 +01:00
LLConvexDecomposition.cmake Initial Support for ND_hacd libs 2011-10-03 22:48:56 -04:00
LLCrashLogger.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLDatabase.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLImage.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLImageJ2COJ.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLInventory.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLKDU.cmake Working around odd corrupted version string interface to kdu library. 2011-08-08 15:19:36 -04:00
LLLogin.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLMath.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLMessage.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLPlugin.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
LLPrimitive.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
LLRender.cmake OPEN-38: Fixes for viewer-autobuild for standalone 2011-04-03 14:34:44 +02:00
LLScene.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLSharedLibs.cmake expand tabs for coding policy 2011-10-11 09:26:40 -04:00
LLTestCommand.cmake merge 2011-04-22 11:50:19 -05:00
LLUI.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLVFS.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLWindow.cmake update apr and sdl archives for linux; added new archive db (needed for linux only). 2011-03-10 00:48:20 +00:00
LLXML.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LLXUIXML.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
LScript.cmake fix files that do not end with a newline (warn-on-failure:copyright because some have both problems...) 2011-08-17 12:42:37 -04:00
Linking.cmake OPEN-38: Fixes for viewer-autobuild for standalone 2011-04-03 14:34:44 +02:00
MediaPluginBase.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
MonoDeps.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
MonoEmbed.cmake mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
MySQL.cmake mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
NDOF.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
OPENAL.cmake fixes to get openal working on windows. 2011-03-01 15:32:35 -08:00
OpenGL.cmake OPEN-58 Ditch GL package for glext.h package since glut.h isn't used anywhere. Probably don't need glext headers for mac or linux as they come in with system updates. 2011-04-06 14:45:27 -05:00
OpenJPEG.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
OpenSSL.cmake STORM-1619 fixes: update llqtwebkit to current build, link libcrypto statically on Mac and Linux. 2011-10-04 12:03:15 -05:00
PNG.cmake update libpng archive for linux. 2011-03-11 23:50:00 +00:00
PluginAPI.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Prebuilt.cmake Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake to skip unnecessary unpacking of already installed packages. 2011-05-04 16:07:27 -07:00
PulseAudio.cmake VWR-23839 Pulseaudio support is crashing web media on some new Linux distros 2010-11-15 16:48:10 +00:00
Python.cmake added python 3.8 to python.cmake 2011-09-25 23:32:12 -07:00
QuickTimePlugin.cmake Download QuickTime prebuilt libs only if the SQK is not installed locally (Windows only); should fix the CMake warnings if SDK is installed 2011-11-26 02:45:49 +01:00
TemplateCheck.cmake Apply server side code to message template verification onto the viewer tree. 2011-03-31 15:43:47 -07:00
Tut.cmake VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a non-standard directory. 2010-12-16 15:43:18 +01:00
UI.cmake FIRE-3431, use packaged libfreetype, by Nicky Dasmijn 2011-10-02 18:32:23 -04:00
UnixInstall.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Utils.cmake Moved version branding into cmake 2011-01-08 00:45:00 -08:00
Variables.cmake Don't override the channel specified by the build. 2011-09-06 23:25:21 -04:00
VersionControl.cmake Moved version branding into cmake 2011-01-08 00:45:00 -08:00
Versions.cmake Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
ViewerMiscLibs.cmake Better way to download the Quicktime prebuilt on Windows to not end up in hacking header files 2011-11-25 01:43:14 +01:00
WebKitLibPlugin.cmake convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
XmlRpcEpi.cmake integrate xmlrpc-epi into windows build. 2011-02-24 12:27:58 -08:00
ZLIB.cmake Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
cmake_dummy.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
run_build_test.py Merge 2011-05-24 14:28:25 -07:00