From 333a9b3f978d6b6485b1c760fd177bdcfea7d2fc Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 9 Feb 2011 10:52:12 -0500
Subject: STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF
 has been used

---
 doc/contributions.txt                       | 1 +
 indra/test_apps/llplugintest/CMakeLists.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8765240caa..143a0f6dc0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -390,6 +390,7 @@ Jonathan Yap
 	STORM-869
 	VWR-17801
 	VWR-24347
+	STORM-977
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index b4043b0fd9..cf97135d88 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,5 @@
 # -*- cmake -*-
-
+if(LL_TESTS)
 project(llplugintest)
 
 include(00-Common)
@@ -537,3 +537,4 @@ if(WINDOWS)
 endif(WINDOWS)
 
 ll_deploy_sharedlibs_command(llmediaplugintest) 
+endif(LL_TESTS)
-- 
cgit v1.2.3


From 55b0c6d6a7a61cdd6729ad5419df3e9426998798 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 16 Feb 2011 14:29:23 -0500
Subject: STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF
 has been used

---
 indra/CMakeLists.txt                        | 4 ++--
 indra/test_apps/llplugintest/CMakeLists.txt | 2 --
 2 files changed, 2 insertions(+), 4 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)
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index cf97135d88..02d7031b81 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,4 @@
 # -*- cmake -*-
-if(LL_TESTS)
 project(llplugintest)
 
 include(00-Common)
@@ -537,4 +536,3 @@ if(WINDOWS)
 endif(WINDOWS)
 
 ll_deploy_sharedlibs_command(llmediaplugintest) 
-endif(LL_TESTS)
-- 
cgit v1.2.3