diff options
| author | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
| commit | 55dbd0c4f3c1cc3598d3d8428dea4a2645b211c4 (patch) | |
| tree | b7b67fd048fda99511042040cf91ac2ae309e728 /indra/CMakeLists.txt | |
| parent | 79664c1017175b2cdfdc4b16c5894bdfdf6e8188 (diff) | |
| parent | ca610bfc82e9f150877efa7e8c4e972d47bce7d4 (diff) | |
merge
Diffstat (limited to 'indra/CMakeLists.txt')
| -rw-r--r-- | indra/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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) |