3 files changed, 12 insertions, 0 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 972bb7dd2d..726ccf90ed 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -2,6 +2,12 @@
 
 add_subdirectory(base)
 
+if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+    add_subdirectory(libvlc)
+    add_subdirectory(example)
+    return()
+endif ()
+
 if (LINUX)
     #add_subdirectory(gstreamer010)
     add_subdirectory(example)
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 64b6a4228d..593aa982f1 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -31,6 +31,7 @@ set(media_plugin_base_HEADER_FILES
 )
 
 add_library(media_plugin_base
+    STATIC
     ${media_plugin_base_SOURCE_FILES}
         )
 
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index a3c1c4ef99..84fac1634c 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -55,3 +55,8 @@ if (DARWIN)
   )
 
 endif (DARWIN)
+
+if (INSTALL)
+	install(TARGETS ${PROJECT_NAME} DESTINATION
+		libexec/${VIEWER_BINARY_NAME}/llplugin)
+endif ()