diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
| commit | 7c2b9221d6678ea7a04f529efaa2e557abce504d (patch) | |
| tree | ba0095eaad5cd0e95577051222953e4c773beac4 /indra/llxml/CMakeLists.txt | |
| parent | e6688f993f82d2683e3eadce96c893959c94be2d (diff) | |
| parent | db85c5b327f872ba321f66726fb05b4b3c3af883 (diff) | |
merge
Diffstat (limited to 'indra/llxml/CMakeLists.txt')
| -rw-r--r-- | indra/llxml/CMakeLists.txt | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index eb5166ee71..fbcfade383 100644 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -45,27 +45,24 @@ target_link_libraries( llxml ${EXPAT_LIBRARIES} ) +# tests -if(LL_TESTS) - # tests +# unit tests - # unit tests +SET(llxml_TEST_SOURCE_FILES + # none yet! + ) +LL_ADD_PROJECT_UNIT_TESTS(llxml "${llxml_TEST_SOURCE_FILES}") - SET(llxml_TEST_SOURCE_FILES - # none yet! - ) - LL_ADD_PROJECT_UNIT_TESTS(llxml "${llxml_TEST_SOURCE_FILES}") +# integration tests - # integration tests +# set(TEST_DEBUG on) +set(test_libs + ${LLXML_LIBRARIES} + ${WINDOWS_LIBRARIES} + ${LLMATH_LIBRARIES} + ${LLCOMMON_LIBRARIES} + ) - # set(TEST_DEBUG on) - set(test_libs - ${LLXML_LIBRARIES} - ${WINDOWS_LIBRARIES} - ${LLMATH_LIBRARIES} - ${LLCOMMON_LIBRARIES} - ) +LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}") - LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}") - -endif(LL_TESTS) |