summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-03-20 15:23:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-03-20 15:23:42 -0400
commitcabb6b6a5f339a69fec25b836f46b8b470eebb90 (patch)
tree7639aed6cb06bb0d9c3d52cb746d1c98f1120dbe /indra/integration_tests
parent739532ee4ffdd58f9d0999901340d5476533fec2 (diff)
parent9d9ad9a876d6498a89f9aeefc9bf258e1674dae7 (diff)
Automated merge with http://hg.secondlife.com/viewer-release
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