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/newview | |
| parent | a6eb1586ae4bd4e81e7d03c91c27ffec78a32cf7 (diff) | |
| parent | 7e47eff5042c2fb897c8eee1219889a84ca3bf36 (diff) | |
Merge branch 'main' into 26.326.3
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 273c0df3af..440c72c561 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -226,7 +226,7 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME} ) if (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}) @@ -241,7 +241,7 @@ if (LINUX) DESTINATION ${_LIB} ) endif () - if (USE_FLATPAK AND USE_OPENAL) + if (USE_OPENAL AND (${LINUX_DISTRO} MATCHES freedesktop)) install( FILES ${ARCH_PREBUILT_DIRS_RELEASE}/libalut.so @@ -266,7 +266,7 @@ install(DIRECTORY skins app_settings fonts PATTERN ".svn" EXCLUDE ) -if (USE_FLATPAK) +if (${LINUX_DISTRO} MATCHES freedesktop) file( COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/hicolor DESTINATION ${CMAKE_CURRENT_BINARY_DIR} @@ -339,7 +339,7 @@ install(FILES ${SCRIPTS_DIR}/messages/message_template.msg DESTINATION share/${VIEWER_BINARY_NAME}/app_settings ) -if (USE_FLATPAK) +if (${LINUX_DISTRO} MATCHES freedesktop) file(COPY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/linux_tools/${VIEWER_BINARY_NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/net.${VIEWER_BINARY_NAME}.Viewer.desktop |