diff options
| author | Jonathan Yap <none@none> | 2011-02-16 14:29:23 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-02-16 14:29:23 -0500 |
| commit | 55b0c6d6a7a61cdd6729ad5419df3e9426998798 (patch) | |
| tree | 0e106ee40b49434fd8a0a240e21ed902a4298923 /indra | |
| parent | 333a9b3f978d6b6485b1c760fd177bdcfea7d2fc (diff) | |
STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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) |