summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
diff options
context:
space:
mode:
authorleyla <leyla@leyla.com>2011-03-14 11:28:13 -0700
committerleyla <leyla@leyla.com>2011-03-14 11:28:13 -0700
commitc762beed267115b7670e01219ccff4fc64bdca4c (patch)
tree8ee42a8defd3bae58759a9dd3517385d830c52b8 /indra/CMakeLists.txt
parentbc2aca863f5d27f551e48a2de8f879360a3a96ab (diff)
parent405a748746c8ea040fe0efeda54e58f378289795 (diff)
Merge
Diffstat (limited to 'indra/CMakeLists.txt')
-rw-r--r--indra/CMakeLists.txt4
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)