summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-03-21 13:03:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-03-21 13:03:04 -0400
commit3238cebcb098cfb36aeeee37a7498d569ab04955 (patch)
tree4459c297533a53bc93dfb11316552805c3ff4500 /indra/integration_tests
parentb187aeb8f177bd76e792652e773617beff18b47b (diff)
parentcabb6b6a5f339a69fec25b836f46b8b470eebb90 (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