From 9e43798e899a0a337d53ac1fa5a1984d3dfeb0f1 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 26 Mar 2015 18:37:51 +0100 Subject: Remove standlone media plugin and fb connect test apps while we transition to CEF --- indra/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 10692402a5..2d45bc938e 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -60,8 +60,9 @@ add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) # llplugin testbed code (is this the right way to include it?) if (LL_TESTS AND NOT LINUX) - add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) - add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) + #removed during webkit -> cef update + #add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) + #add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) endif (LL_TESTS AND NOT LINUX) endif (ENABLE_MEDIA_PLUGINS) -- cgit v1.2.3 From cb7f84a470d7afeb1501cf5514333c6ee15d96df Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 2 Oct 2015 11:14:28 -0700 Subject: MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced. --- indra/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 2d45bc938e..133c5ee265 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -57,13 +57,6 @@ add_subdirectory(${VIEWER_PREFIX}test) if (ENABLE_MEDIA_PLUGINS) # viewer media plugins add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) - - # llplugin testbed code (is this the right way to include it?) - if (LL_TESTS AND NOT LINUX) - #removed during webkit -> cef update - #add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) - #add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) - endif (LL_TESTS AND NOT LINUX) endif (ENABLE_MEDIA_PLUGINS) if (LINUX) -- cgit v1.2.3