From fc3c0f48d92bf9c3dcad622b2b8e9340edc92c7c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 31 Dec 2024 18:13:54 +0800 Subject: Decide lib64 or x86_64-linux-gnu based on distro Some builders might just have their installation somehow customised to have both. --- indra/media_plugins/libvlc/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/media_plugins/libvlc') diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 6d005bb6d2..84e0d1da59 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -90,10 +90,10 @@ if (INSTALL) /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib DESTINATION ${_LIB}/plugins ) - elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) + elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu) - elseif (EXISTS /lib64 AND NOT ${LINUX_DISTRO} MATCHES arch) - set(_LIB lib64) + elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) + set(_LIB lib${ADDRESS_SIZE}) else (DARWIN) set(_LIB lib) endif (DARWIN) -- cgit v1.2.3