From cadf6842074bed0ece498f53ed17abf75861c7da Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 21 Jun 2024 22:18:25 +0800 Subject: Get installed libmedia_plugin_gstreamer.so found In viewer manifest the 10 suffix is removed, with CPack it might as well be named without the suffix. I haven't been able to get streaming working on FBSD, though. Maybe I need to install something. --- indra/media_plugins/gstreamer10/CMakeLists.txt | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/indra/media_plugins/gstreamer10/CMakeLists.txt b/indra/media_plugins/gstreamer10/CMakeLists.txt index 14ce5bfaa1..f9898368cc 100644 --- a/indra/media_plugins/gstreamer10/CMakeLists.txt +++ b/indra/media_plugins/gstreamer10/CMakeLists.txt @@ -1,6 +1,6 @@ # -*- cmake -*- -project(media_plugin_gstreamer10) +project(media_plugin_gstreamer) include(00-Common) include(LLCommon) @@ -16,7 +16,7 @@ include(GStreamer10Plugin) ### media_plugin_gstreamer10 -set(media_plugin_gstreamer10_SOURCE_FILES +set(${PROJECT_NAME}_SOURCE_FILES media_plugin_gstreamer10.cpp ) @@ -25,12 +25,12 @@ set(media_plugin_gstreamer10_HEADER_FILES llmediaimplgstreamertriviallogging.h ) -add_library(media_plugin_gstreamer10 +add_library(${PROJECT_NAME} SHARED - ${media_plugin_gstreamer10_SOURCE_FILES} + ${${PROJECT_NAME}_SOURCE_FILES} ) -target_link_libraries(media_plugin_gstreamer10 media_plugin_base ll::gstreamer10 ) +target_link_libraries(${PROJECT_NAME} media_plugin_base ll::gstreamer10 ) if (WINDOWS) set_target_properties( @@ -39,3 +39,14 @@ if (WINDOWS) LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMT" ) endif (WINDOWS) + +if (INSTALL) + if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) + set(_LIB lib/${ARCH}-linux-gnu) + elseif (EXISTS /lib64) + set(_LIB lib64) + else () + set(_LIB lib) + endif () + install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB}) +endif () -- cgit v1.2.3