diff options
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 12 | 
2 files changed, 52 insertions, 4 deletions
| diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 7f44270fe7..080e37bac8 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -133,10 +133,46 @@ endif (DARWIN)  if (INSTALL)      if (DARWIN)          set(_LIB llplugin) -    elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) -        set(_LIB lib/${ARCH}-linux-gnu) -    elseif (EXISTS /lib64) -        set(_LIB lib64) +        install( +            DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/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" +            DESTINATION SLPlugin.app/Contents/Frameworks +            ) +    elseif (LINUX) +        if (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) +            set(_LIB lib/${ARCH}-linux-gnu) +        elseif (EXISTS /lib64) +            set(_LIB lib64) +        endif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) +        install( +            PROGRAMS +                ${AUTOBUILD_INSTALL_DIR}/bin/release/chrome-sandbox +                ${AUTOBUILD_INSTALL_DIR}/bin/release/dullahan_host +            DESTINATION libexec/${VIEWER_BINARY_NAME} +            #PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +        ) +        install( +            FILES +                ${AUTOBUILD_INSTALL_DIR}/lib/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 +                ${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} +            )      else (DARWIN)          set(_LIB lib)      endif (DARWIN) diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 1710d18f4d..893c9ef4f4 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -81,6 +81,18 @@ endif (DARWIN)  if (INSTALL)      if (DARWIN)          set(_LIB llplugin) +        install( +            DIRECTORY /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/plugins +            DESTINATION ${_LIB} +            ) +        install( +            FILES +                /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.5.dylib +                /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlc.dylib +                /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.9.dylib +                /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib/libvlccore.dylib +            DESTINATION ${_LIB}/plugins +            )      elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)          set(_LIB lib/${ARCH}-linux-gnu)      elseif (EXISTS /lib64) | 
