diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 22:50:25 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 22:50:25 -0500 |
| commit | ba83360f56de6c5881934247df5290fddf0e0270 (patch) | |
| tree | f7d0c7c6a1d7f1f7fc95f3e388ceac728e0685a1 | |
| parent | 50a3f19f1a0421419155cab099b63e3436a24c7f (diff) | |
| parent | 938b803d894cb4be0af2f4068ab98fd6f4cad08f (diff) | |
DRTVWR-418: Merge backout that restores llcorehttp tests.
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index a58b783fc4..6f362df921 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -96,12 +96,7 @@ target_link_libraries( ) # tests -##========================================================================== -## DANGER WILL ROBINSON! WARNING! -## Leaving these tests commented out is extremely hazardous, since llcorehttp -## is so central to viewer processing. -##========================================================================== -if (0) ## LL_TESTS) +if (LL_TESTS) SET(llcorehttp_TEST_SOURCE_FILES tests/test_allocator.cpp ) @@ -226,4 +221,5 @@ endif (DARWIN) target_link_libraries(http_texture_load ${example_libs}) -endif () +endif (LL_TESTS) + |