diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-24 18:37:22 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-24 18:37:22 +0300 |
| commit | abf8c4b364bca97d4295797a14f459d85bef1714 (patch) | |
| tree | 0c5ef77720e75ada89b03898dd24fc38854a1375 | |
| parent | 9451b50b2b855d6de6cc7141428575c06f46aeb0 (diff) | |
SL-10297 windows local build fix
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
| -rw-r--r-- | indra/cmake/bugsplat.cmake | 7 | ||||
| -rwxr-xr-x | 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 5f5cc51f63..4edc4c59cd 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 9f9821b4be..6194328759 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -683,12 +683,6 @@ class WindowsManifest(ViewerManifest): 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" |