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 ancestrymaster
parent
fe487f46e3
commit
68da2bdfee
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue