diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-01 13:31:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-01 13:31:14 +0800 |
| commit | 29d68ecb229ecb19e6d0da4cf5fbd8e3bbdde2cf (patch) | |
| tree | e60f85379679aa2b07c8a17a1fcd4954572149c2 /indra/newview/ViewerInstall.cmake | |
| parent | a38b53cc5f456593e8ca21c5d5e20542c1723525 (diff) | |
| parent | 1478ec8e9c50eba8b3a64fb9c2fc54a3a328510b (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview/ViewerInstall.cmake')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 7ee70132c0..e648d8cc47 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -7,37 +7,41 @@ install(PROGRAMS linux_tools/launch_url.sh ) if (LINUX) - 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(FILES - ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so - DESTINATION ${_LIB}) - install(PROGRAMS - ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox - DESTINATION libexec/${VIEWER_BINARY_NAME} - PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(PROGRAMS - ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host - DESTINATION libexec/${VIEWER_BINARY_NAME}) - install(FILES - ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin - ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin - DESTINATION ${_LIB}) - install(FILES - ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak - ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak - ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat - ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak - DESTINATION ${_LIB}) - install(DIRECTORY - ${AUTOBUILD_INSTALL_DIR}/resources/locales - 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(FILES + ${AUTOBUILD_INSTALL_DIR}/lib/release/libcef.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13 + ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.22 + DESTINATION ${_LIB}) + install(PROGRAMS + ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox + DESTINATION libexec/${VIEWER_BINARY_NAME} + #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE + #GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + install(PROGRAMS + ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host + DESTINATION libexec/${VIEWER_BINARY_NAME}) + install(FILES + ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin + ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin + DESTINATION ${_LIB}) + install(FILES + ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak + ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak + ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat + ${AUTOBUILD_INSTALL_DIR}/resources/resources.pak + DESTINATION ${_LIB}) + install(DIRECTORY + ${AUTOBUILD_INSTALL_DIR}/resources/locales + DESTINATION ${_LIB}) endif (LINUX) install(DIRECTORY skins app_settings fonts |