diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
| commit | e68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (patch) | |
| tree | 6454bf6b303d03f89e567a6ea9cfee7c85aaa1ac /indra/llvfs/CMakeLists.txt | |
| parent | 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff) | |
| parent | 771195865c4fb336f573025e9a7a22313bfb6cb8 (diff) | |
merge
Diffstat (limited to 'indra/llvfs/CMakeLists.txt')
| -rw-r--r-- | indra/llvfs/CMakeLists.txt | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index 722f4e2bfd..05c7c7860c 100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt @@ -67,17 +67,15 @@ if (DARWIN) endif (DARWIN) -if(LL_TESTS) - # Add tests - include(LLAddBuildTest) - # UNIT TESTS - SET(llvfs_TEST_SOURCE_FILES - # none so far - ) - LL_ADD_PROJECT_UNIT_TESTS(llvfs "${llvfs_TEST_SOURCE_FILES}") - - # INTEGRATION TESTS - set(test_libs llmath llcommon llvfs ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) - # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests. - LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}") -endif(LL_TESTS) +# Add tests +include(LLAddBuildTest) +# UNIT TESTS +SET(llvfs_TEST_SOURCE_FILES + # none so far + ) +LL_ADD_PROJECT_UNIT_TESTS(llvfs "${llvfs_TEST_SOURCE_FILES}") + +# INTEGRATION TESTS +set(test_libs llmath llcommon llvfs ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) +# TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests. +LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}") |