Age | Commit message (Collapse) | Author |
|
|
|
chopper)
|
|
|
|
|
|
|
|
mac_updater build
|
|
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).
|
|
Add non-broken FindZLIB.cmake.
|
|
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.
|
|
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).
|
|
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.
|
|
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).
|
|
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.
|
|
|
|
|
|
|
|
make (in progress, don't pull yet)
|
|
|
|
kdu lib name for windows
|
|
|
|
|
|
|
|
|
|
|
|
llkdu building
|
|
|
|
tests. Rev. by Brad
|
|
|
|
|
|
|
|
This reduces the number of symbols in the viewer binary by about 30%.
Also, fixed test errors revealed by inlining being enabled.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ssh://bitbucket.org/merov_linden/viewer-development-storm-137
|
|
envorment. This will allow one to pass via command line custom fmod lib names. ie: -DFMOD_NAMES:STRING:"fmod-4.44"
|
|
FMOD.cmake:
Move include(Prebuilt) to prebuilt section. It is only used for prebuilt anyway.
set(FMOD_FIND_REQUIRED ON) due to FMOD variable is use elsewhere in cmake files. This behaviour is the same as openal.
Remove redudent error messages and code due to above.
Rework the logic to be more cleaner.
Clean up whitespace.
FindFMOD.cmake
Remove redudent paths as cmake allready uses them as default. Use PATH_SUFFIXES instead.
The above will result in cmake looking in a lot more places and can handle custom build setups better.
Change FMOD to FMOD_FOUND. FMOD should not be change withen cmake.
Whitespace cleanup.
|
|
for unit tests)
|
|
|
|
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff
patching file indra/cmake/LLAddBuildTest.cmake
Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line).
Added entry in doc/contributions.txt. No further changes.
originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
|
|
|
|
fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
|
|
|
|
|
|
|