diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
| commit | 3c521d8207092f1c48e158082b88c5e81cc9c440 (patch) | |
| tree | 36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/CMakeLists.txt | |
| parent | 74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
viewer-release 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) |