From b0e28d27bd990393e22ca3f474c340e77a08357b Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 18 Dec 2023 20:42:30 +0800 Subject: Unix install sets plugin dir to system library dir because (at least) the vlc/plugins dirs are inside it in the same way it's been inside llplugin. This is so the app can find system VLC plugins. And for this, BUILD_SHARED_LIBS set on must work first on Linux (has already been working on FreeBSD), since libmedia_plugin_libvlc is a shared library (which now gets installed to system library dir too, on both OSes). --- indra/llprimitive/llphysicsextensions/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llphysicsextensions/CMakeLists.txt b/indra/llprimitive/llphysicsextensions/CMakeLists.txt index fb15e7b782..258cea5dd7 100644 --- a/indra/llprimitive/llphysicsextensions/CMakeLists.txt +++ b/indra/llprimitive/llphysicsextensions/CMakeLists.txt @@ -80,7 +80,14 @@ list(REMOVE_ITEM ${PROJECT_NAME}_HEADER_FILES LLPhysicsExtensionsStubImpl.h) #install(FILES ${${PROJECT_NAME}_HEADER_FILES} DESTINATION include/${PROJECT_NAME}) if (BUILD_SHARED_LIBS) - install(TARGETS ${PROJECT_NAME}stub DESTINATION lib) + 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}stub DESTINATION ${_LIB}) endif () if (LINUX) -- cgit v1.2.3