-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[sentry-native] Fix linux runtime error and windows usage (#39122)
Co-authored-by: Jon <[email protected]>
- Loading branch information
1 parent
47dcaa2
commit 1fcea05
Showing
5 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/external/crashpad/handler/CMakeLists.txt b/external/crashpad/handler/CMakeLists.txt | ||
index be0e544..b0d44af 100644 | ||
--- a/external/crashpad/handler/CMakeLists.txt | ||
+++ b/external/crashpad/handler/CMakeLists.txt | ||
@@ -89,7 +89,7 @@ if(NOT IOS) | ||
main.cc | ||
) | ||
|
||
- if(LINUX) | ||
+ if(LINUX AND BUILD_SHARED_LIBS) | ||
target_sources(crashpad_handler PRIVATE | ||
../client/pthread_create_linux.cc | ||
) | ||
diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in | ||
index 8840f5d..af3e84c 100644 | ||
--- a/sentry-config.cmake.in | ||
+++ b/sentry-config.cmake.in | ||
@@ -9,7 +9,7 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@) | ||
|
||
if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS) | ||
include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") | ||
- if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS) | ||
+ if(NOT SENTRY_BUILD_SHARED_LIBS) | ||
find_dependency(ZLIB) | ||
endif() | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters