diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-31 19:34:11 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-31 19:34:11 +0800 |
| commit | cdd2eaf40207117722d046fcc9c5707b884c4b49 (patch) | |
| tree | 832adf924846582cbc649686788cfba6a740604b /indra/media_plugins | |
| parent | a6eb1586ae4bd4e81e7d03c91c27ffec78a32cf7 (diff) | |
| parent | 7e47eff5042c2fb897c8eee1219889a84ca3bf36 (diff) | |
Merge branch 'main' into 26.326.3
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
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 |