diff -r e94a353050d8 indra/CMakeLists.txt
--- a/indra/CMakeLists.txt	Wed Feb 09 10:52:12 2011 -0500
+++ b/indra/CMakeLists.txt	Wed Feb 16 14:29:00 2011 -0500
@@ -72,9 +72,9 @@
   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 -r e94a353050d8 indra/test_apps/llplugintest/CMakeLists.txt
--- a/indra/test_apps/llplugintest/CMakeLists.txt	Wed Feb 09 10:52:12 2011 -0500
+++ b/indra/test_apps/llplugintest/CMakeLists.txt	Wed Feb 16 14:29:00 2011 -0500
@@ -1,5 +1,4 @@
 # -*- cmake -*-
-if(LL_TESTS)
 project(llplugintest)
 
 include(00-Common)
@@ -537,4 +536,3 @@
 endif(WINDOWS)
 
 ll_deploy_sharedlibs_command(llmediaplugintest) 
-endif(LL_TESTS)