From abf8c4b364bca97d4295797a14f459d85bef1714 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 24 Jun 2021 18:37:22 +0300
Subject: [PATCH] SL-10297 windows local build fix
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
---
indra/cmake/bugsplat.cmake | 7 ++++++-
indra/newview/viewer_manifest.py | 6 ------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake
index 5f5cc51f631..4edc4c59cdb 100644
--- a/indra/cmake/bugsplat.cmake
+++ b/indra/cmake/bugsplat.cmake
@@ -1,5 +1,10 @@
if (INSTALL_PROPRIETARY)
- set(USE_BUGSPLAT ON CACHE BOOL "Use the BugSplat crash reporting system")
+ # Note that viewer_manifest.py makes decision based on BUGSPLAT_DB and not USE_BUGSPLAT
+ if (BUGSPLAT_DB)
+ set(USE_BUGSPLAT ON CACHE BOOL "Use the BugSplat crash reporting system")
+ else (BUGSPLAT_DB)
+ set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
+ endif (BUGSPLAT_DB)
else (INSTALL_PROPRIETARY)
set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
endif (INSTALL_PROPRIETARY)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9f9821b4bee..61943287598 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -683,12 +683,6 @@ def construct(self):
self.path("libvlccore.dll")
self.path("plugins/")
- if not self.args.get('bugsplat'): # don't include the win_crash_logger if we are using BugSplat
- # pull in the crash logger from other projects
- # tag:"crash-logger" here as a cue to the exporter
- self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
- dst="win_crash_logger.exe")
-
if not self.is_packaging_viewer():
self.package_file = "copied_deps"
--
GitLab