aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Switched to Phoenix Viewers Boost 1.43 libs for WindowsPatrick Sapinski2011-02-271-3/+1
|
* Fixed cmake using the old windows gstreamer plugin libsMcCabe Maxsted2011-02-181-4/+4
|
* Make media_plugin_gstreamer010 find all its headers correctly on Windows ↵McCabe Maxsted2011-02-101-5/+13
| | | | (notes: need to add archives for iconv and gstreamer to install.xml, doesn't link yet)
* Updated windows version of boost to the 1.39 version used in Snowglobe 1.5. ↵McCabe Maxsted2011-02-101-1/+3
| | | | Note: only VS2005 libs currently included
* Disable SSE4 on Mac (temporarily).Jacek Antonelli2010-11-131-2/+2
| | | | GCC 4.0 on Mac OS X 10.5 can't handle SSE4, GCC 4.2 fails.
* Fixed fontconfig library not being set for Linux-onlyMcCabe Maxsted2010-11-121-3/+5
|
* Add support for using ld.gold on linux.Aleric Inglewood2010-11-122-3/+14
| | | | | | | | | | 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!). Thanks to Siana Gearz for pointing out that ld.gold is so much faster.
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-074-23/+18
| | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* Deleted OPENAL.cmake.imp fileMcCabe Maxsted2010-11-021-115/+0
|
* Added missing qtxmlpatterns4.dll to CopyWinLibs.cmakeMcCabe Maxsted2010-11-021-0/+4
|
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-282-13/+7
|\
| * Merge branch 'weekly' of http://github.com/imprudence/imprudence into weeklyAleric Inglewood2010-10-282-13/+7
| |\
| | * Changed default compile settings for Mac. Now SSE3 and SSE4 are enabled by ↵elektrahesse2010-10-182-13/+7
| | | | | | | | | | | | default, gcc-4.2 is used and 10.5 SDK is auto selected. Build from commandline in Release mode now work perfectly (./develop.py -t Release build) without the need for Xcode at all.
* | | Load prebuilt glib when needed. Don't compile gstreamer plugin on windows.Aleric Inglewood2010-10-273-7/+11
| | | | | | | | | | | | | | | Also, darwin doesn't use quicktime, so disabled compiling that plugin for darwin.
* | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-261-0/+8
|\ \ \
| * \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-251-0/+8
| |\ \ \ | | |/ /
| | * | Download prebuilt vivox (and 32bitcompatibilitylibs on 64bit) even when ↵Aleric Inglewood2010-10-251-0/+8
| | |/ | | | | | | | | | using standalone.
* | | Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵McCabe Maxsted2010-10-261-0/+2
| | | | | | | | | | | | can be sorted on windows
* | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-231-0/+2
|\ \ \ | |/ /
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| | * Added detection for Python 2.7 (currently untested)McCabe Maxsted2010-10-161-0/+2
| | |
| | * Merge branch 'weekly' of git://github.com/mccabe/imprudence into weeklyelektrahesse2010-10-101-0/+1
| | |\
| | | * Use all those cores for compileRobin Cornelius2010-10-091-0/+1
| | | |
| | * | Removed not needed libgio-2.0 dependency on OSXelektrahesse2010-10-091-1/+0
| | |/
* | | Fixed copy_win_libs by removing glib dllsMcCabe Maxsted2010-10-231-8/+0
|/ /
* | Forgot QtWebKit and Qt plugins in last commit.Aleric Inglewood2010-10-181-2/+14
| | | | | | | | | | Standalone now works (I have no idea why it worked before, since obviously I tested it before committing the previous commit).
* | Find Qt4 with find_package on STANDALONE.Aleric Inglewood2010-10-171-1/+11
| | | | | | | | | | | | If Qt is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running imprudence of course (or the webkit plugin will silently fail).
* | RED-595: Manual merge with weekly-webkit.Aleric Inglewood2010-10-152-18/+82
| | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml.
* | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-1019-323/+596
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * | Let the gstreamer plugin build on windowsRobin Cornelius2010-10-101-5/+24
| | |
| * | linux* kill imprudence gstreamer, use system gstreamer instead.Armin Weatherwax2010-09-232-122/+12
| | | | | | | | | | | | | | | who ever builds a release with that needs to consider to install some really old gstreamer at /usr/local/lib - lenny has 0.10.19
| * | update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not ↵Armin Weatherwax2010-09-231-0/+28
| | | | | | | | | | | | | | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit
| * | Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-232-1/+20
| | |
| * | Added fix for word size from Snowglobe (only for Windows--didn't update ↵McCabe Maxsted2010-09-231-0/+1
| | | | | | | | | | | | Linux or Mac as I can't test them)
| * | CMake now runs correctly on WindowsMcCabe Maxsted2010-09-231-0/+16
| | |
| * | Removed 'prepare' dependency from cmakeMcCabe Maxsted2010-09-231-1/+0
| | |
| * | Fixed CopyWinLibs. Still a bunch of CMake errors and plugins don't load on ↵McCabe Maxsted2010-09-232-386/+173
| | | | | | | | | | | | Windows
| * | llmediaplugins first stepArmin Weatherwax2010-09-2317-77/+664
| | |
* | | Use all those cores for compileRobin Cornelius2010-10-091-0/+1
| |/ |/|
* | Fixed (again) how libjpeg is found on Mac. (#256/#464)Jacek Antonelli2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Related information from Nemurimasu Neiro: stay away from find_library! due to an undocumented feature of find_xxx functions in CMake, no additional libraries may be found after the first call to a find_xxx function that searches the prebuilt libraries folder. CMake will request the folder contents *at most once* and libraries added by install.py will be missed.
* | RED-429: Link against prebuilt libraries / always use gtk-related system ↵Aleric Inglewood2010-10-082-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libs (linux) This patch fixes the problem that there were no 'developer' symlinks for the prebuilt packages (which is not needed for runtim), causing the casual user that tries to compile the viewer on linux (without using --standalone) to link against their system libs (while using the header files of the prebuilt versions), often causing linker errors. It also fixes the fact that a few libraries were completely missing, most notably the dbusglib package only had header files and not a library at all! libgio and libpangocairo where missing from the link command line so that the wrong libraries were picked up, if any at all. Finally, the last GTK related prebuilt libraries have simply been removed from the packaging: linux has those installed (or else the users will know how to install them as soon as they see that the viewer complains about a missing library). This is much more stable, as all those libraries more or less form a whole. Or rather, the libraries that use glib, as especially that one gives a problem at the moment since the latest glib has new g_malloc_n functions that don't exist in the prebuilt glib. Note the difference between a USER compiling her own viewer, and the imprudence team compiling a release: When the imprudence team compiles a release we need to create a portable binary that runs on many versions of linux. In order to achieve that we link against "old" library versions, so that the viewer still works on old operating systems, and (hopefull) also on newer systems, since libraries with the same SONAME are backwards compatible. With g_malloc_n as example: our viewer binary doesn't use that function, so a user that links with their own glib will never have a problem, whether or not his library provides this function. On the other hand, when a user gets the sources and compiles his own viewer he wants to use the LATEST library versions: his own operating system ones. The best way to achieve this is to configure with --standalone, but that currently demands that ALL libraries are installed on her system, including a few very-hard-to-get libraries. If she therefore chooses to configure without --standalone, she suddenly gets all the old library versions, forcing her to at least link against those at compile time (in order to minimize the risk of version incompatibilities). A better solution for the do-it-yourself user would be to have a --semi-standalone configuration that only uses the hard-to-get prebuilt libs and further uses as much the operating system libraries as possible. For most of the hard-to-get libraries this is no problem since they all only depend on libc and similar stable ABI libs.
* | RED-560: Add support for STANDALONE to OPENAL.cmakeAleric Inglewood2010-10-021-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pkg_check_modules to find freealut (and openal) for STANDALONE. Non-standalone is untouched by this version. The changes relative to snowglobe (for the STANDALONE path) is that I removed the 'include(FindOpenAL) (that comes with cmake) which not only doesn't find libalut, but even sets the wrong cmake variables (it sets OPENAL_LIBRARY, and our cmake scripts *use* OPENAL_LIBRARIES). Moreover, under the assumption that STANDALONE really is only for linux (and I think that is so), every linux distribution DOES have freealut (and openal) installed with a pkg-config anyway. I also removed pkg_check_modules(openal) because it is redundant: freealut pulls that in already.
* | RED-560: Revert changes to indra/cmake/OPENAL.cmakeAleric Inglewood2010-10-021-19/+104
| | | | | | | | | | Revert the changes introduced in http://github.com/AlericInglewood/imprudence/commit/e71d3ea2fad63fa2ec81685a9b09c1bed6b493be
* | Merge branch 'weekly' of http://github.com/imprudence/imprudence into weeklyAleric Inglewood2010-10-021-0/+0
|\ \
| * | RED-579: SNOW-751: 'configure' with cmake 2.8 is extremely slow.Aleric Inglewood2010-10-021-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that indra/cmake/CMakeLists.txt is missing on imprudence, so I couldn't add 'FindZLIB.cmake' to the list of source files (see http://svn.secondlife.com/trac/linden/browser/projects/2009/snowglobe/trunk/indra/cmake/CMakeLists.txt) I added a comment to http://github.com/mccabe/imprudence/commit/39f625963e408ec5dd394e202506700259b9b508 that adds an empty indra/cmake/CMakeLists.txt If Jacek follows up and copies snowglobe's CMakeLists.txt then she'll have to remove the FindZLIB.cmake from it if she tests it before merging with THIS commit. In that case it has to be added back when merging that commit with this one. Tested on imprudence with cmake 2.8.2: * Without patch, 'configure' takes 100 seconds. * With patch, 'configure' takes 4 seconds.
| * | RED-573: FindTut.cmake is missing: tut.h is not searched for.Aleric Inglewood2010-10-012-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch only affects --standalone. It was basically ported from Snowglobe with the following change: If LL_TESTS is not set, then tut.h is not required (this is an improvement, because if LL_TESTS is not set no tests should be created or run). I tested it with -DLL_TESTS:BOOL=ON, -DLL_TESTS:BOOL=OFF and no -DLL_TESTS* at all, with and without tut installed, internally and externally. Things worked as expected. Most notably, with tut.h installed in libraries/include/, it is NOT found. This is necessary because using -Ilibraries/include for standalone is a no no: prebuilt stuff might be downloaded, but we don't want to use it! That directory contains potentially many other libraries.
| * | RED-561: Optimization flags used during --Type=Debug (linux x86_64)Aleric Inglewood2010-10-011-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/561 Fixed erroneous use of optimization flags when not compiling Release. Also removed -DLL_VECTORIZE from compile options: that is set in a header file (llv4math.h), not on the commandline. Patch affects only 64 bit linux.
| * | RED-552: VWR-12838: NDOF is assumed to exist, even with --standalone.Aleric Inglewood2010-10-012-9/+62
| | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/552 Add FindNDOF.cmake and treat it like every other library (on standalone).
| * | Added empty indra/cmake/CMakeLists.txt to suppress a CMake 2.8 warning.Jacek Antonelli2010-09-231-0/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CMake Warning (dev) at CMakeLists.txt:36 (add_subdirectory): The source directory /home/jacek/imprudence/linden/indra/cmake does not contain a CMakeLists.txt file. CMake does not support this case but it used to work accidentally and is being allowed for compatibility. Policy CMP0014 is not set: Input directories must have CMakeLists.txt. Run "cmake --help-policy CMP0014" for policy details. Use the cmake_policy command to set the policy and suppress this warning. This warning is for project developers. Use -Wno-dev to suppress it."
* | RED-579: SNOW-751: 'configure' with cmake 2.8 is extremely slow.Aleric Inglewood2010-09-301-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that indra/cmake/CMakeLists.txt is missing on imprudence, so I couldn't add 'FindZLIB.cmake' to the list of source files (see http://svn.secondlife.com/trac/linden/browser/projects/2009/snowglobe/trunk/indra/cmake/CMakeLists.txt) I added a comment to http://github.com/mccabe/imprudence/commit/39f625963e408ec5dd394e202506700259b9b508 that adds an empty indra/cmake/CMakeLists.txt If Jacek follows up and copies snowglobe's CMakeLists.txt then she'll have to remove the FindZLIB.cmake from it if she tests it before merging with THIS commit. In that case it has to be added back when merging that commit with this one. Tested on imprudence with cmake 2.8.2: * Without patch, 'configure' takes 100 seconds. * With patch, 'configure' takes 4 seconds.
generated by cgit v1.1 at 2024-11-15 12:50:23 +0000