diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-01 11:50:12 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-01 11:50:12 -0800 |
| commit | f86e1125568ee24eb6879b7669555aa4d29a4e64 (patch) | |
| tree | 72316d126983e00dcca06c46297ee521833b3ccd | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
| parent | 55b0c6d6a7a61cdd6729ad5419df3e9426998798 (diff) | |
STORM-977 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/test_apps/llplugintest/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 280781d8d1..806d3ecb2c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -401,6 +401,7 @@ Jonathan Yap STORM-980 VWR-17801 VWR-24347 + STORM-977 Kage Pixel VWR-11 Ken March diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 6d17a6f402..7ba43f4b13 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -72,9 +72,9 @@ if (VIEWER) add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) # llplugin testbed code (is this the right way to include it?) - if (NOT LINUX) + if (LL_TESTS AND NOT LINUX) add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) - endif (NOT LINUX) + endif (LL_TESTS AND NOT LINUX) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index b4043b0fd9..02d7031b81 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -1,5 +1,4 @@ # -*- cmake -*- - project(llplugintest) include(00-Common) |