diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
| commit | ce9962b33872db65b70c9b10901ec9062cb59169 (patch) | |
| tree | 94be5367128e241ef1c6f802e8551a9b4ed786ff /indra/llcommon/CMakeLists.txt | |
| parent | 8642f57dd95864ec6b002f6519701f30866c6502 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 5cce8ff2c4..3a4a8facc2 100644..100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -17,6 +17,7 @@ include_directories( ${EXPAT_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} + ${BREAKPAD_INCLUDE_DIRECTORIES} ) # add_executable(lltreeiterators lltreeiterators.cpp) @@ -246,7 +247,6 @@ set(llcommon_HEADER_FILES lluuid.h lluuidhashmap.h llversionserver.h - llversionviewer.h llworkerthread.h ll_template_cast.h metaclass.h @@ -337,6 +337,7 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(reflection "" "${test_libs}") LL_ADD_INTEGRATION_TEST(stringize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lleventdispatcher "" "${test_libs}") + LL_ADD_INTEGRATION_TEST(lleventcoro "" "${test_libs};${BOOST_CONTEXT_LIBRARY}") LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstreamqueue "" "${test_libs}") |