diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
| commit | cb936d097fd40c743895cb35fce6b292c66e5210 (patch) | |
| tree | c554c33c7576aa567ca2b32ad06ee9af83977059 /indra/llxml | |
| parent | 32313dd3c6396324ea8f13285a69c01f38fe1cfc (diff) | |
| parent | bd37b14e9217935b9d70faf04c835c9d4aeda9c7 (diff) | |
pull back fix for STORM-1260 from beta branch
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/CMakeLists.txt | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index eb5166ee71..21cdf5f926 100644 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -45,27 +45,25 @@ target_link_libraries( llxml ${EXPAT_LIBRARIES} ) +# tests -if(LL_TESTS) - # tests +if (LL_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}") - -endif(LL_TESTS) + LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}") +endif (LL_TESTS) |