diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-30 14:50:37 -0400 |
commit | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (patch) | |
tree | e0d7326fc438f7b579e3ddbcbb4772afa5402d23 /indra/llcommon/CMakeLists.txt | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
parent | d4fb82c217bccda536f7a7b2ca1809bb8c2dba40 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
-rwxr-xr-x | indra/llcommon/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 1459b9ada2..de5aa0fde4 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -162,6 +162,7 @@ set(llcommon_HEADER_FILES llhash.h llheartbeat.h llindexedvector.h + llinitdestroyclass.h llinitparam.h llinstancetracker.h llkeythrottle.h @@ -178,6 +179,7 @@ set(llcommon_HEADER_FILES llmortician.h llnametable.h llpointer.h + llpounceable.h llpredicate.h llpreprocessor.h llpriqueuemap.h @@ -310,6 +312,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) |