Skip to content
Snippets Groups Projects
Commit 68da2bdf authored by James Cook's avatar James Cook
Browse files

Merge build patch for Linux server builds from xui-army. I believe this fixes...

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
parent fe487f46
No related branches found
No related tags found
No related merge requests found
# -*- cmake -*- # -*- cmake -*-
# Only set this up for viewer builds, because the llui library is most closely
# related to the viewer
if (VIEWER)
project (llui_libtest) project (llui_libtest)
include(00-Common) include(00-Common)
...@@ -89,9 +93,9 @@ if (WINDOWS) ...@@ -89,9 +93,9 @@ if (WINDOWS)
) )
endif (WINDOWS) endif (WINDOWS)
if (VIEWER) # Ensure people working on the viewer don't break this library
# Ensure people working on the viewer don't break this library # *NOTE: This could be removed, or only built by Parabuild, if the build
# *NOTE: This could be removed, or only built by Parabuild, if the build # and link times become too long. JC
# and link times become too long. JC add_dependencies(viewer llui_libtest)
add_dependencies(viewer llui_libtest)
endif (VIEWER) endif (VIEWER)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment