From 333a9b3f978d6b6485b1c760fd177bdcfea7d2fc Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 9 Feb 2011 10:52:12 -0500 Subject: STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used --- indra/test_apps/llplugintest/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/test_apps') 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 0ea1b472c636415a48b8cc688ec9b7663be6dc9d Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 9 Feb 2011 10:12:20 -0800 Subject: Additional fix for llmediaplugintest compilation failure after fix for VWR-21275 --- indra/test_apps/llplugintest/llmediaplugintest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/test_apps') diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 4a2272032b..e9d4d99753 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1620,7 +1620,7 @@ mediaPanel* LLMediaPluginTest::addMediaPanel( std::string url ) std::string user_data_path = std::string( cwd ) + "/"; #endif media_source->setUserDataPath(user_data_path); - media_source->init( launcher_name, plugin_name, false ); + media_source->init( launcher_name, user_data_path, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters @@ -1860,7 +1860,7 @@ mediaPanel* LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string #endif media_source->setUserDataPath(user_data_path); - media_source->init( launcher_name, plugin_name, false ); + media_source->init( launcher_name, user_data_path, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters -- cgit v1.2.3 From 55b0c6d6a7a61cdd6729ad5419df3e9426998798 Mon Sep 17 00:00:00 2001 From: Jonathan Yap 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/test_apps/llplugintest/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/test_apps') 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