Skip to content

Commit

Permalink
Allow setting CRASHPAD_WER_ENABLED when using system crashpad (#816)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyriuz committed Mar 13, 2023
1 parent 1f14ef0 commit 903c17a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- Remove OpenSSL as direct dependency for the crashpad backend on Linux. ([#812](https://github.com/getsentry/sentry-native/pull/812), [crashpad#81](https://github.com/getsentry/crashpad/pull/81))
- Check `libcurl` for feature `AsynchDNS` at compile- and runtime. ([#813](https://github.com/getsentry/sentry-native/pull/813))
- Allow setting `CRASHPAD_WER_ENABLED` when using system crashpad. ([#816](https://github.com/getsentry/sentry-native/pull/816))

## 0.6.0

Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,9 @@ if(SENTRY_BACKEND_CRASHPAD)
set(CRASHPAD_ENABLE_INSTALL ON CACHE BOOL "Enable crashpad installation" FORCE)
endif()
add_subdirectory(external/crashpad crashpad_build)

if(CRASHPAD_WER_ENABLED)
add_compile_definitions(CRASHPAD_WER_ENABLED)
add_dependencies(sentry crashpad::wer)
endif()

# set static runtime if enabled
Expand Down Expand Up @@ -482,8 +483,9 @@ if(SENTRY_BACKEND_CRASHPAD)
endif()
endif()
add_dependencies(sentry crashpad::handler)

if(CRASHPAD_WER_ENABLED)
add_dependencies(sentry crashpad::wer)
add_compile_definitions(CRASHPAD_WER_ENABLED)
endif()
elseif(SENTRY_BACKEND_BREAKPAD)
option(SENTRY_BREAKPAD_SYSTEM "Use system breakpad" OFF)
Expand Down

0 comments on commit 903c17a

Please sign in to comment.