diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
commit | df55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch) | |
tree | c8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/llcommon/CMakeLists.txt | |
parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
parent | 234ea528505d0363c4c4eb0150e7587e863c8e20 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
-rwxr-xr-x | indra/llcommon/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 1459b9ada2..d2d507d676 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -178,6 +178,7 @@ set(llcommon_HEADER_FILES llmortician.h llnametable.h llpointer.h + llpounceable.h llpredicate.h llpreprocessor.h llpriqueuemap.h @@ -310,6 +311,7 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstreamqueue "" "${test_libs}") + LL_ADD_INTEGRATION_TEST(llpounceable "" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) |