summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2011-02-17merge changes for storm-937Oz Linden
2011-02-16merging in latest viewer-developmentOz Linden
2011-02-09STORM-981 : Fix Linux link issues when LL_TESTS is ONMerov Linden
2011-02-09STORM-937 : Fix python scripts shebang line and license header for consistencyMerov Linden
2011-01-24Automated merge with https://bitbucket.org/lindenlab/viewer-developmentAndrew A. de Laix
2011-01-21merge changes for vwr-24347Oz Linden
2011-01-19fix include path for KDU headersAlain Linden
2011-01-19Cmake updates to get llkdu building on linux. Need to rebuild kdu tarball next.jenn
2011-01-18Added 'slvoice' (vivox) to autobuild.xml for linux.jenn
This is version 3.1 of the lib; viewer was using version 3.2, but this version has been rebuilt using the new package layout. Hopefully it will work, though we may need to convert version 3.2 if it does not. Updated Copy3rdParyLibs.cmake paths for linux installation of vivox files.
2011-01-18fix path to prebiuld slvoice libraries on mac and linux.Andrew A. de Laix
2011-01-18Added entries to autobuild.xml for 'openal_soft' and 'google' libs on linux.jenn
These packages have been rebuilt to use the new package layout (thanks alain!). 'openal_soft' was also renamed to use an underscore in its name rather than a dash.
2011-01-14windows autobuildibatized (bye bye install.py...)Alain Linden
2011-01-13mac buiding with autobuild and autobuild style packages (just say no to ↵Andrew A. de Laix
install.py)
2011-01-11remove develop.py and references to it (use autobuild instead)Andrew A. de Laix
2011-01-06STORM-826 (workaround): correct mixed and dos-style line endingsOz Linden
2010-12-29VWR-24347 Fix reversion--allow VS2005 Express user to specify location of ↵Jonathan Yap
msvc* files
2010-12-23Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-exportOz Linden
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21STORM-453 : pull in viewer-developmentMerov Linden
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-15STORM-453 : Points to the 7.21 curl libs, fixes curl cmake, fixes ↵Merov Linden
mac_updater build
2010-12-15VWR-24254: Add support for using ld.gold on linux.Aleric Inglewood
To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). VWR-24254: Don't link with fontconfig on non-linux. While we already added fontconfig in the above patch, that code turned out to also be used by Windows and Darwin (contrary to the comments in the code). After looking at the history of commits and a discussion on IRC it was decided that the original coder (Kyle Ambroff <ambroff@lindenlab.com>) really meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-12-20VWR-24261: Configuration with cmake 2.8 is extremely slowAleric Inglewood
Add non-broken FindZLIB.cmake.
2010-12-16VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a ↵Aleric Inglewood
non-standard directory. If tut/tut.hpp isn't installed in a standard include directory all tests fail because the found include directory for tut isn't passed to the compiler. This patch fixes this by passing it. Note that using include_directories() in a Find*.cmake file is bad practise. The correct way is to set an include dir variable and call include_directories() once. It certainly doesn't work for the tests anyway because the tests are all over the place and include_directories is on a per folder basis. What is needed is to set it for each (test) target. However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we have is to set the COMPILE_FLAGS property for a target. Fortunately, standalone is only used for linux, so we can just use -I${TUT_INCLUDE_DIR} to get the effect we want.
2010-12-15VWR-10579: Fix NDOF.cmake to do the right thing on standalone.Aleric Inglewood
The old one just assumed that libndof is installed, even on standalone. This patch looks for it on standalone, unless configured with -DNDOF:BOOL=OFF, and when not found prints an error message (including telling about -DNDOF:BOOL=OFF).
2010-12-15SNOW-240: Fix libjson naming madness, again, for standalone.Aleric Inglewood
SNOW-240 was actually about adding the whole search. While this has been done, there is one issue left: On linux (and remember, all of this is about standalone) the libjson packages of distributions don't have this complex compiler version baked into their name. See also the last comment on SNOW-240: https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305 This patch fixes this issue by first searching for libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so and when that fails search for the system package library file libjson.so.
2010-12-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail).
2010-12-15VWR-24247: develop.py configure still searches for the wrong header file ↵Aleric Inglewood
when checking for Tut The viewer code includes "tut/tut.hpp" everywhere, so that is what we should search for when determining an include path for this header. This just searches in the usual places, including the paths provided through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what we need.
2010-12-09CHOP-265 Fixed up LL_SEND_CRASH_REPORTS usage. Reviewed by Brad.Mark Palange (Mani)
2010-11-27mergeTofu Buzzard
2010-11-22STORM-151 : Attempt to fix Windows static linking, simplified manifestMerov Linden
2010-11-19STORM-151 : Modify llkdu cmake to point explicitely to static libs, simplify ↵Merov Linden
make (in progress, don't pull yet)
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-18STORM-151 : Modified install.py to point to the new kdu 6.4.1 and changed ↵Merov Linden
kdu lib name for windows
2010-11-17Merge with viewer-developmentBryan O'Sullivan
2010-11-17It is safe to use Python 2.7 on Windows, if presentBryan O'Sullivan
2010-11-17Update slvoice dependency for WindowsBryan O'Sullivan
2010-11-16Replace template verification code with an md5sum check.Christian Goetze (CG)
2010-11-15VWR-23839 Pulseaudio support is crashing web media on some new Linux distrosTofu Buzzard
2010-11-12STORM-151 : Got decompression to work, compression disabled, simplified ↵Merov Linden
llkdu building
2010-11-10MergeMark Palange (Mani)
2010-11-10CHOP-151 Imported patch from server-trunk to support preprocessor at unit ↵Mark Palange (Mani)
tests. Rev. by Brad
2010-11-05Merge latest lindenlab/viewer-development with mani_linden/viewer-development.brad kittenbrink
2010-11-04merge with STORM-105Merov Linden
2010-11-04merge with STORM-105Merov Linden
2010-11-04Turned inlining on in windows builds (RelWithDebInfo and Release).brad kittenbrink
This reduces the number of symbols in the viewer binary by about 30%. Also, fixed test errors revealed by inlining being enabled.
2010-10-27STORM-104 : make kdu statically linked, suppress the need for llkduMerov Linden
2010-10-27SH-392 Port over fix from mesh-development for FBOs on OSXDave Parks
2010-10-16merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUEBoroondas Gupte
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 11:33:22 +0000