diff options
| author | James Cook <james@lindenlab.com> | 2009-06-23 22:54:48 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-06-23 22:54:48 +0000 |
| commit | 68da2bdfee46bcdb7a9893e05f30bfe0a2d9aaf6 (patch) | |
| tree | 9bd6a6fcd8e7b5ff6fc9bbdf324380683b1cf0da /indra | |
| parent | fe487f46e37f0db1e8cee7a3e52020e06a79d196 (diff) | |
Merge build patch for Linux server builds from xui-army. I believe this fixes the "llui_libtest -lllui not found" build error.
Merging revisions 123378-123379 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army into G:\viewer-2-0-link\latest, respecting ancestry
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index 68556ac4ab..88564c6085 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -1,5 +1,9 @@ # -*- cmake -*- +# Only set this up for viewer builds, because the llui library is most closely +# related to the viewer +if (VIEWER) + project (llui_libtest) include(00-Common) @@ -89,9 +93,9 @@ if (WINDOWS) ) endif (WINDOWS) -if (VIEWER) - # Ensure people working on the viewer don't break this library - # *NOTE: This could be removed, or only built by Parabuild, if the build - # and link times become too long. JC - add_dependencies(viewer llui_libtest) +# Ensure people working on the viewer don't break this library +# *NOTE: This could be removed, or only built by Parabuild, if the build +# and link times become too long. JC +add_dependencies(viewer llui_libtest) + endif (VIEWER) |