diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
| commit | 8188a8c410807debd2d7d40d0299c36b92e56ca3 (patch) | |
| tree | 68a586a4f32bfd1f395c4942701813e002047622 /indra/CMakeLists.txt | |
| parent | 2dbf6569a77c37d7c7ecc684dd417ddbbb7c6bab (diff) | |
| parent | 6ed4c84a30e8f4044ccaedba114e13e07ae5c46d (diff) | |
merge
Diffstat (limited to 'indra/CMakeLists.txt')
| -rwxr-xr-x | indra/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index bdbfc55fa2..410d25ad97 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -63,10 +63,11 @@ add_subdirectory(${VIEWER_PREFIX}test) # viewer media plugins add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) -# llplugin testbed code (is this the right way to include it?) -if (LL_TESTS AND NOT LINUX) - add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) -endif (LL_TESTS AND NOT LINUX) + # llplugin testbed code (is this the right way to include it?) + if (LL_TESTS AND NOT LINUX) + add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) + add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) + endif (LL_TESTS AND NOT LINUX) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) |