summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-02-09 10:52:12 -0500
committerJonathan Yap <none@none>2011-02-09 10:52:12 -0500
commit333a9b3f978d6b6485b1c760fd177bdcfea7d2fc (patch)
tree1a6bdf7cf4330bbabf0cd13e467ad95e1d76a7f5
parent09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff)
STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/test_apps/llplugintest/CMakeLists.txt3
2 files changed, 3 insertions, 1 deletions
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)