From 7e47eff5042c2fb897c8eee1219889a84ca3bf36 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 31 Jul 2026 19:29:02 +0800 Subject: Compare LINUX_DISTRO with freedesktop on Flatpak so no need for USE_FLATPAK, and just maybe there are some other platforms that use this runtime as the distro info. --- indra/media_plugins/cef/CMakeLists.txt | 4 ++-- indra/media_plugins/libvlc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 1622d3091f..666826dc89 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -157,7 +157,7 @@ if (INSTALL) DESTINATION ${_LIB} ) elseif (LINUX) - if (USE_FLATPAK) + if (${LINUX_DISTRO} MATCHES freedesktop) set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) @@ -166,7 +166,7 @@ if (INSTALL) else () set(_LIB lib/${VIEWER_BINARY_NAME}) endif () - if (USE_FLATPAK) + if (${LINUX_DISTRO} MATCHES freedesktop) install( PROGRAMS ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 24174a6ef0..ae0b35b1b0 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -94,7 +94,7 @@ if (INSTALL) /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib DESTINATION ${_LIB}/plugins ) - elseif (USE_FLATPAK) + elseif (${LINUX_DISTRO} MATCHES freedesktop) set(_LIB lib) install( DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}/vlc -- cgit v1.3