diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-06-23 20:11:30 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-06-23 20:11:30 +0800 |
| commit | a5f7a2ba98a40f225ae4fb53d5fcf4423eb21e48 (patch) | |
| tree | af7cbd01b3e248986c116cd6a257c2125c4093a9 /indra/newview | |
| parent | 17758a9e652618e2cfa0f41bd5758fe5814548f8 (diff) | |
| parent | 0f5b40798a6c122b7104d6bafefcb7decaad2fc3 (diff) | |
Merge branch 'main' into 26.3
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b0a04413d1..c1c15a5b88 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1874,6 +1874,13 @@ else () ) endif () +if (CMAKE_BUILD_TYPE MATCHES Release AND (CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU)) + add_custom_command( + TARGET ${VIEWER_BINARY_NAME} POST_BUILD + COMMAND ${CMAKE_STRIP} ${VIEWER_BINARY_NAME} + ) +endif () + if(USE_PRECOMPILED_HEADERS) target_precompile_headers( ${VIEWER_BINARY_NAME} PRIVATE llviewerprecompiledheaders.h ) endif(USE_PRECOMPILED_HEADERS) diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index cce94b0d46..42d175fdaa 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -227,7 +227,7 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME} if (LINUX) if (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo)) |