aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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.
* | | RED-573: FindTut.cmake is missing: tut.h is not searched for.Aleric Inglewood2010-09-302-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-09-281-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-560: Imprudence doesn't compile when configured with --standaloneAleric Inglewood2010-09-283-107/+35
| | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/560
* | | RED-552: VWR-12838: NDOF is assumed to exist, even with --standalone.Aleric Inglewood2010-09-282-9/+62
|/ / | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/552 Add FindNDOF.cmake and treat it like every other library (on standalone).
* | stay away from find_library!Nemurimasu Neiro2010-09-132-10/+4
| | | | | | | | | | | | | | | | 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.
* | linux64: move cxx flags from external script into 00-Common.cmake for ↵Armin Weatherwax2010-09-101-1/+17
| | | | | | | | | | | | transparency todo: do it less hacky
* | fix: 32bit libs for linux64 are not actually downloadedArmin Weatherwax2010-09-101-2/+2
| |
* | Fixed Boost.cmake and removed the boost::system and boost::filesystem ↵elektrahesse2010-09-101-6/+0
| | | | | | | | dependencies
* | Fixed Boost.cmake to correctly find the boost_system lib on macElektra Hesse2010-09-041-2/+2
| |
* | Added fonts package to install.xml.Jacek Antonelli2010-09-041-0/+2
| | | | | | | | Contains DejaVu Sans Condensed, Liberation Sans, and Vera Mono.
* | linux64: fetch 32 bit libraries required for voiceArmin Weatherwax2010-09-031-0/+3
| |
* | fix libjpeg linking on Mac OSNemurimasu Neiro2010-09-021-1/+5
| | | | | | | | | | my custom builds were linking against /usr/local/lib/libjpeg.8.dylib and causing a version mismatch error when trying to use JPEGs
* | pull boost 1.39 from LL for Linux32, add boost system and boost filesystem ↵Armin Weatherwax2010-09-011-1/+6
| | | | | | | | to cmake
* | added spellcheck + translation from Emerald Viewer. references to ↵Patrick Sapinski2010-08-305-0/+140
| | | | | | | | modularsystems.sl should be changed!
* | Added AAC decoding to GStreamer for WindowsMcCabe Maxsted2010-08-281-0/+4
| |
* | Updated windows version of openal-soft to 1.12.854McCabe Maxsted2010-08-211-2/+2
| |
* | Re-added voice in CopyWinLibs.cmake and viewer_manifest.pyMcCabe Maxsted2010-08-121-0/+33
|/
* Fixed cmake not finding Mac libxml2 and libpng12.Jacek Antonelli2010-06-262-14/+6
|
* Made CMake find the viewer version in xmlMcCabe Maxsted2010-06-191-1/+1
|
* Reactivated libELFIO for Linux64 (it wasn't causing the crash).Armin Weatherwax2010-03-132-4/+5
| | | | (Reverts part of commit 30945b74.)
* Linux: de-obfuscate dbus handling; better handle_secondlifeprotocol.sh.Armin Weatherwax2010-03-041-2/+2
|
* Some changes to help linux64.Armin Weatherwax2010-02-272-13/+30
| | | | | | | * Don't build with libELFIO (lib not working). * Use shared libpng12 instead of static library (fixes mozlib incompat for users with system libpng14).
* Fixed 'Cannot generate a safe linker search path' CMake warning on WindowsMcCabe Maxsted2010-01-121-6/+7
|
* Fixed missing dbghelp.dll fileMcCabe Maxsted2010-01-091-0/+4
|
* Always include VS2005 redist in copy_win_libsMcCabe Maxsted2010-01-091-85/+84
|
* Fixed GStreamer missing libpng12-0.dll (TODO: update gstreamer)McCabe Maxsted2010-01-081-0/+2
|
* Use ${ARCH} instead of x86_64 in CMake.Armin Weatherwax2010-01-031-3/+1
| | | | (Cherry picked by Jacek from f604a685)
* Fix just another hardcoded path to Linux-i686.Armin Weatherwax2010-01-031-0/+3
| | | | (Cherry picked by Jacek from 2e96ac24)
* Trying the new 64bit libs and adding the adjustments needed.Armin Weatherwax2010-01-031-1/+3
| | | | (Cherry picked by Jacek from 13412855)
* Added Imprudence VC80 .config files to the repoMcCabe Maxsted2009-12-061-4/+4
|
* Forgot to remove the debug entry for libpng12-0.dll from CopyWinLibs.cmakeMcCabe Maxsted2009-12-061-1/+0
|
* Moved the viewer artwork to its own CMake fileMcCabe Maxsted2009-12-062-10/+14
|
* Removed libpng12-0.dll from CopyWinLibs.cmakeMcCabe Maxsted2009-12-061-1/+0
|
* Made downloading the artwork work while using the --standalone flagMcCabe Maxsted2009-12-062-3/+8
|
* Added Imprudence viewer artwork to install.xmlMcCabe Maxsted2009-12-061-0/+5
|
* Removed VS2003 boost references from CMakeMcCabe Maxsted2009-12-061-12/+2
|
* Compile flag "-Wno-non-virtual-dtor" is for C++, not C.Jacek Antonelli2009-11-281-2/+2
| | | | Fixes a warning when compiling Mac updater.
* Merged SL 1.23.5 into Imprudence.Jacek Antonelli2009-11-281-1/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/CopyWinLibs.cmake linden/indra/lib/python/indra/util/llversion.py linden/indra/llcommon/llversionviewer.h linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/llassetuploadresponders.cpp linden/indra/newview/llpreview.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/viewer_manifest.py
| * Second Life viewer sources 1.23.5Jacek Antonelli2009-11-031-1/+47
| |
* | Merge remote branch 'mccabe/1.3.0-next' into nextJacek Antonelli2009-11-1916-45/+268
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/00-Common.cmake linden/indra/newview/skins/default/xui/de/floater_about.xml linden/indra/newview/skins/default/xui/fr/floater_about.xml linden/indra/newview/skins/default/xui/ja/floater_about.xml linden/indra/newview/skins/default/xui/ko/floater_about.xml linden/indra/newview/skins/default/xui/zh/floater_about.xml linden/install.xml
| * | Fixed CMake setting errorsMcCabe Maxsted2009-11-152-1/+3
| | |
generated by cgit v1.1 at 2025-04-04 16:37:39 +0000