From dc0c1b93128a3c7b78a1ecb5b09d2d373608c107 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 10 Feb 2022 00:24:23 -0500
Subject: [PATCH] Fix forced symbol generation for sentry
---
indra/cmake/00-Common.cmake | 2 +-
indra/cmake/Sentry.cmake | 5 +----
indra/cmake/Variables.cmake | 8 +++++++-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 279384b74c9..339e1adfbd6 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -85,7 +85,7 @@ if (WINDOWS)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
endif (ADDRESS_SIZE EQUAL 32)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR FULL_DEBUG_SYMS OR USE_CRASHPAD)
+ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR FULL_DEBUG_SYMS OR USE_SENTRY)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FULL")
else ()
diff --git a/indra/cmake/Sentry.cmake b/indra/cmake/Sentry.cmake
index 5206534f7d7..8df371de2a8 100644
--- a/indra/cmake/Sentry.cmake
+++ b/indra/cmake/Sentry.cmake
@@ -1,7 +1,4 @@
-option(USE_SENTRY "Use the Sentry crash reporting system" OFF)
-if (DEFINED ENV{USE_SENTRY})
- set(USE_SENTRY $ENV{USE_SENTRY} CACHE BOOL "" FORCE)
-endif()
+include(Variables)
if (USE_SENTRY)
if (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 3f49aa6f364..b712f88d78d 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -51,6 +51,12 @@ set(VIEWER_SYMBOL_FILE "" CACHE STRING "Name of tarball into which to place symb
option(USE_CEF "Enable CEF media plugin" ON)
option(USE_VLC "Enable VLC media plugin" ON)
+#Crash reporting
+option(USE_SENTRY "Use the Sentry crash reporting system" OFF)
+if (DEFINED ENV{USE_SENTRY})
+ set(USE_SENTRY $ENV{USE_SENTRY} CACHE BOOL "" FORCE)
+endif()
+
if(LIBS_CLOSED_DIR)
file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
else(LIBS_CLOSED_DIR)
@@ -171,7 +177,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif()
set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS YES)
- if(FULL_DEBUG_SYMS OR USE_CRASHPAD)
+ if(FULL_DEBUG_SYMS OR USE_SENTRY)
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
else()
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf)
--
GitLab