Merge branch 'main' into 26.3

7 files changed, 41 insertions, 5 deletions

diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index 65170b5744..34c3ed0ec9 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -15,7 +15,7 @@ if (INSTALL)
   endif ()
 
   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))
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 2a6aa10165..f7adb9404b 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -61,6 +61,13 @@ elseif (DARWIN)
   )
 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 ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_STRIP} ${PROJECT_NAME}
+    )
+endif ()
+
 if (BUILD_SHARED_LIBS)
   set_target_properties(SLPlugin PROPERTIES LINK_FLAGS_RELEASE
     "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined")
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index 761aab8a7a..6fb4616087 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -69,6 +69,14 @@ ADD_CUSTOM_COMMAND(TARGET llwebrtc POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different
                        $<TARGET_FILE:llwebrtc>
                                ${SHARED_LIB_STAGING_DIR})
+
+if (CMAKE_BUILD_TYPE MATCHES Release AND (CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU))
+  add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_STRIP} lib${PROJECT_NAME}.so
+    )
+endif ()
+
 # Add tests
 if (LL_TESTS)
 endif (LL_TESTS)
@@ -77,7 +85,7 @@ if (INSTALL)
     if (DARWIN)
         set(_LIB ../Frameworks)
     elseif (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))
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index a3d36d0ed7..ee9a709c1e 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -133,6 +133,13 @@ if (DARWIN)
 
 endif (DARWIN)
 
+if (CMAKE_BUILD_TYPE MATCHES Release AND (CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU))
+  add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_STRIP} lib${PROJECT_NAME}.so
+    )
+endif ()
+
 if (INSTALL)
     if (DARWIN)
         set(_LIB SLPlugin.app/Contents/Frameworks)
@@ -151,7 +158,7 @@ if (INSTALL)
             )
     elseif (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))
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 3177b3298d..24174a6ef0 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -72,6 +72,13 @@ if (DARWIN)
 
 endif (DARWIN)
 
+if (CMAKE_BUILD_TYPE MATCHES Release AND (CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU))
+  add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_STRIP} lib${PROJECT_NAME}.so
+    )
+endif ()
+
 if (INSTALL)
     if (DARWIN)
         set(_LIB SLPlugin.app/Contents/Frameworks)
@@ -88,7 +95,7 @@ if (INSTALL)
             DESTINATION ${_LIB}/plugins
             )
     elseif (USE_FLATPAK)
-        set(_LIB lib${ADDRESS_SIZE})
+        set(_LIB lib)
         install(
             DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}/vlc
             DESTINATION ${_LIB}
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))