Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ea4d32b4adccd2971cab78369d78ebde1e2d68fe
SingularityViewer/indra/cmake
History
Aleric Inglewood fbb5dced97 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llcommon/CMakeLists.txt
	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llpumpio.cpp
	indra/llmessage/llpumpio.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llspatialpartition.cpp
	indra/newview/llviewermedia.cpp
	indra/newview/llxmlrpctransaction.cpp

Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
2012-08-13 17:07:25 +02:00
..
00-Common.cmake
Improvements!
2012-07-19 17:44:19 -04:00
AIStateMachine.cmake
Make FilePicker context sensitive default paths persistent over logins.
2011-05-13 23:50:56 +02:00
APR.cmake
OSX libwork
2012-07-14 04:10:09 -04:00
Audio.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
BasicPluginBase.cmake
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
2011-05-08 17:10:38 +02:00
BerkeleyDB.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
Boost.cmake
OSX libwork
2012-07-14 04:10:09 -04:00
BuildVersion.cmake
Fixed CMake issue with Git version when building locally.
2012-02-11 23:04:16 -05:00
CARes.cmake
Fix build on Windows
2012-03-12 00:35:47 +01:00
cmake_dummy.cpp
Imported existing code
2010-04-02 02:48:44 -03:00
CMakeCopyIfDifferent.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
CMakeLists.txt
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
CopyBackToSource.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
CopyWinLibs.cmake
Fixing windows build
2012-07-05 22:38:24 +02:00
CSharpMacros.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
CURL.cmake
Merge branch 'master' into curlthreading
2012-07-20 00:37:58 +02:00
Cwdebug.cmake
Final compile/link bug fixes for debug_libcurl code.
2012-08-07 20:57:39 +02:00
DBusGlib.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
DirectX.cmake
I forgot why I made these.
2012-02-19 17:07:42 -05:00
DownloadPrebuilt.cmake.in
Prebuilt fetch now honors CMake-specified plattform
2011-12-25 05:21:37 +01:00
ELFIO.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
ExamplePlugin.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
EXPAT.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
FindAPR.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindBerkeleyDB.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindCARes.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindELFIO.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindGooglePerfTools.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindHunSpell.cmake
Spell check added
2011-04-23 18:08:59 -04:00
FindJsonCpp.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
FindLLQtWebkit.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
FindMT.cmake
Dos2Unix line endings and a file mode change
2012-07-04 00:29:59 +00:00
FindNDOF.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindOpenJPEG.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindSCP.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FindTut.cmake
Put in some changes along sg1.4 dev history.
2010-11-21 15:57:44 +01:00
FindXmlRpcEpi.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
FMOD.cmake
Melanie's fix of FMOD on OS X
2012-02-16 13:23:00 +01:00
FMODEX.cmake
Linux64 libs and fixes
2012-07-16 16:10:15 -04:00
FreeType.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
Glui.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
Glut.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
GooglePerfTools.cmake
Linux64 libs and fixes
2012-07-16 16:10:15 -04:00
GStreamer010Plugin.cmake
Fix underlinkage of libmedia_plugin_gstreamer.so
2011-05-08 17:32:05 +02:00
Hunspell.cmake
OSX libwork
2012-07-14 04:10:09 -04:00
JPEG.cmake
General cleanup of OSX support - not done
2012-07-15 17:45:50 -04:00
JsonCpp.cmake
General cleanup of OSX support - not done
2012-07-15 17:45:50 -04:00
Linking.cmake
General cleanup of OSX support - not done
2012-07-15 17:45:50 -04:00
LLAddBuildTest.cmake
Add support for libcwd.
2011-05-08 17:08:48 +02:00
LLAudio.cmake
llAudio security patch. The other edit was already included.
2010-09-12 18:19:28 -04:00
LLCharacter.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLCommon.cmake
I forgot why I made these.
2012-02-19 17:07:42 -05:00
LLCrashLogger.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLDatabase.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLImage.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLImageJ2COJ.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLInventory.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLKDU.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLMath.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLMessage.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLPlugin.cmake
I forgot why I made these.
2012-02-19 17:07:42 -05:00
LLPrimitive.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLRender.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLScene.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLUI.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LLVFS.cmake
Port Viewer 2 indra/llvfs
2011-06-06 21:38:58 +02:00
LLWindow.cmake
Linux64 libs and fixes
2012-07-16 16:10:15 -04:00
LLXML.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
LScript.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
MediaPluginBase.cmake
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
2011-05-08 17:10:38 +02:00
NDOF.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
OPENAL.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
OpenGL.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
OpenJPEG.cmake
Integrated OpenJPEG 1.4
2010-11-17 02:39:27 +01:00
OpenSSL.cmake
General cleanup of OSX support - not done
2012-07-15 17:45:50 -04:00
PluginAPI.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
PNG.cmake
Improvements!
2012-07-19 17:44:19 -04:00
Prebuilt.cmake
Fixed prebuilt fetching, Snowglobe style
2011-05-08 23:25:21 +02:00
PulseAudio.cmake
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
Python.cmake
I forgot why I made these.
2012-02-19 17:07:42 -05:00
QuickTimePlugin.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
RunBuildTest.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
TemplateCheck.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
Tut.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
UI.cmake
Fixing windows build
2012-07-05 22:38:24 +02:00
UnixInstall.cmake
Imported existing code
2010-04-02 02:48:44 -03:00
Variables.cmake
General cleanup of OSX support - not done
2012-07-15 17:45:50 -04:00
ViewerMiscLibs.cmake
Fixing Win compile. (Partial)
2011-05-08 20:34:32 +02:00
WebKitLibPlugin.cmake
Fix webkit on Ubuntu
2012-02-21 15:52:57 +01:00
XmlRpcEpi.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00
ZLIB.cmake
First set of changes for new librarys and lib layout support!
2012-07-04 00:26:42 +00:00