summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-02-07 14:31:27 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-02-07 14:31:27 -0500
commit2681d5403ca0cdf686077d7b14ffa9111f9e9f5d (patch)
tree1de7a70c9cf77417b893cdf8a163de315520a213 /indra/integration_tests
parent33a42b32ca72031a79edca821966f6ebbdcddc93 (diff)
parent32e11494ffde368b2ac166e16dc294d66a18492f (diff)
Automated merge with file:C%3A%5CUsers%5CNat%5Clinden%5Cviewer-tut-fix
Diffstat (limited to 'indra/integration_tests')
-rw-r--r--indra/integration_tests/llui_libtest/CMakeLists.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 1180460f4b..633ad84159 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -18,7 +18,6 @@ include(LLWindow)
include(LLUI)
include(LLVFS) # ugh, needed for LLDir
include(LLXML)
-include(LLXUIXML)
include(Linking)
# include(Tut)
@@ -32,7 +31,6 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
- ${LLXUIXML_INCLUDE_DIRS}
)
set(llui_libtest_SOURCE_FILES