summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-26 16:43:58 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-26 16:43:58 -0400
commit74d4f8af01358c0975351f90f044c03bc9c50c4c (patch)
tree72b8f043cd5787409718d1ca7be21ec32cf10657 /indra/integration_tests
parent52411f83a1e92d8449f68a6528f5b78e7c391553 (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
v-r to drano merge conflicts wip
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