summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-07-30 20:14:16 +0800
committerErik Kundiman <erik@megapahit.org>2023-07-30 20:14:16 +0800
commit9a16a223d3cd61a65871fe828e302f5e082bd1fb (patch)
tree095b9f3e9692b25b2737928c26eb0a1bf65ad33e
parente08ad14176502a8cc26b401c48b7161ce8c39140 (diff)
libmedia_plugin_libvlc is installed to system too
libmedia_plugin_base is now explicitly set as static, since it could be set as shared when BUILD_SHARED_LIBS is on and it's just easier to have it compiled into with every media plugin cause it's small and would only be shared by 2 dynamic libraries anyway. Trying to put a dynamic version where the media plugin can find it so the reference is not broken, seems like a hassle.
-rw-r--r--indra/media_plugins/base/CMakeLists.txt1
-rw-r--r--indra/media_plugins/libvlc/CMakeLists.txt4
2 files changed, 5 insertions, 0 deletions
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..cdaf3efbfa 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -55,3 +55,7 @@ if (DARWIN)
)
endif (DARWIN)
+
+if (INSTALL)
+ install(TARGETS ${PROJECT_NAME} DESTINATION ${APP_LIBEXEC_DIR}/llplugin)
+endif ()