From 68da2bdfee46bcdb7a9893e05f30bfe0a2d9aaf6 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 23 Jun 2009 22:54:48 +0000
Subject: [PATCH] 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
---
.../integration_tests/llui_libtest/CMakeLists.txt | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 68556ac4ab4..88564c60853 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)
--
GitLab