summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-04-27 20:23:16 +0800
committerErik Kundiman <erik@megapahit.org>2025-04-27 20:23:16 +0800
commit481b6bb4c4dfd57a509bd73e51ca57338ad4d860 (patch)
tree9e03ceeeb3240b47d471f628ca83e0b14209c88b /indra/media_plugins
parentb74c8ee3fee8dd640f40250ed09f213afa72cefc (diff)
parentb04cc0b90ab93141d3ffc77bceb241da41c37ace (diff)
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index bf1e990450..99810d77d8 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -140,15 +140,15 @@ if (INSTALL)
if (DARWIN)
set(_LIB llplugin)
install(
- DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
+ DIRECTORY "${ARCH_PREBUILT_DIRS_RELEASE}/Chromium Embedded Framework.framework"
DESTINATION ../Frameworks
)
install(
DIRECTORY
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper.app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
- "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
+ "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper.app"
+ "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (GPU).app"
+ "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (Plugin).app"
+ "${ARCH_PREBUILT_DIRS_RELEASE}/DullahanHelper (Renderer).app"
DESTINATION SLPlugin.app/Contents/Frameworks
)
elseif (LINUX)
@@ -178,7 +178,7 @@ if (INSTALL)
endif (${LINUX_DISTRO} MATCHES arch)
install(
FILES
- ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so
${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin
${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin
${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak