diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-23 22:34:22 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-23 22:34:22 +0800 |
| commit | 3518e8a432e826f62e598e6af43ab388d57b53a2 (patch) | |
| tree | aa71fb80a1e63626647f6a8fe584ade394724de7 /indra/media_plugins | |
| parent | 89a1c2d9e578f0e165765f708a5f2eb7886e64b7 (diff) | |
Revert "Links to libGLESv2.so & libvulkan.so.1 for Flatpak"
This reverts commit 9870f317f0ed1f2be6e4fa2d33669a71ec59e549.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 06118dd19e..ee9a709c1e 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -209,19 +209,15 @@ if (INSTALL) DIRECTORY ${AUTOBUILD_INSTALL_DIR}/resources/locales DESTINATION ${_LIB} ) - file(MAKE_DIRECTORY ${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}) if (USE_FLATPAK) - file(CREATE_LINK - "/usr/lib/${ARCH}-linux-gnu/libGLESv2.so.2" - "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libGLESv2.so" - SYMBOLIC - ) - file(CREATE_LINK - "/usr/lib/${ARCH}-linux-gnu/libvulkan.so.1" - "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libvulkan.so.1" - SYMBOLIC + install( + FILES + ${ARCH_PREBUILT_DIRS_RELEASE}/libGLESv2.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libvulkan.so.1 + DESTINATION ${_LIB} ) else () + file(MAKE_DIRECTORY ${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}) file(CREATE_LINK "../libGLESv2.so" "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libGLESv2.so" @@ -232,13 +228,13 @@ if (INSTALL) "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libvulkan.so.1" SYMBOLIC ) + install( + FILES + ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libGLESv2.so + ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libvulkan.so.1 + DESTINATION ${_LIB} + ) endif () - install( - FILES - ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libGLESv2.so - ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libvulkan.so.1 - DESTINATION ${_LIB} - ) endif () elseif (WINDOWS) set(_LIB llplugin) |