diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 11:15:31 -0500 |
| commit | f8ed44f8ec80916e684c2783da02f89474710de6 (patch) | |
| tree | 2a4ca145439751e864beb6be91cde52a7901b036 /indra/CMakeLists.txt | |
| parent | 11ab03331f5028455a56245fc9121b82068565cc (diff) | |
| parent | 0d71baba74e2009e88471e2c44e78863b34a5817 (diff) | |
merge latest updates from nat and callum
Diffstat (limited to 'indra/CMakeLists.txt')
| -rwxr-xr-x | indra/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 24ea59ca49..29f02b58ba 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -60,6 +60,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components) # Legacy C++ tests. Build always, run if LL_TESTS is true. add_subdirectory(${VIEWER_PREFIX}test) +if (ENABLE_MEDIA_PLUGINS) # viewer media plugins add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) @@ -68,6 +69,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) endif (LL_TESTS AND NOT LINUX) +endif (ENABLE_MEDIA_PLUGINS) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) |