diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-07-27 01:54:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 16:54:30 -0700 |
| commit | 7dbc05515b44bf54d2a42b4da9d1e1f910868b86 (patch) | |
| tree | 20439139743ba75dba05892145ebf10b33424a6d /ports/sentry-native | |
| parent | f6e78c3d87b17d7e9cbbae69902501c7e7870ac9 (diff) | |
| download | vcpkg-7dbc05515b44bf54d2a42b4da9d1e1f910868b86.tar.gz vcpkg-7dbc05515b44bf54d2a42b4da9d1e1f910868b86.zip | |
[zlib] Add cmake wrapper (#18914)
* Format manifest
* Add cmake wrapper
* x-add-version
* Always use vcpkg zlib for sentry native
* x-add-version
* Fix and simplify wrapper
* Update git-tree
Diffstat (limited to 'ports/sentry-native')
| -rw-r--r-- | ports/sentry-native/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sentry-native/use-zlib-target.patch | 12 | ||||
| -rw-r--r-- | ports/sentry-native/vcpkg.json | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 7fac38cf5..80f745bb6 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex( fix-warningC5105.patch
fix-config-cmake.patch
fix-libcurl.patch
+ use-zlib-target.patch
)
if (NOT DEFINED SENTRY_BACKEND)
@@ -37,6 +38,7 @@ vcpkg_configure_cmake( -DSENTRY_BUILD_TESTS=OFF
-DSENTRY_BUILD_EXAMPLES=OFF
-DSENTRY_BACKEND=${SENTRY_BACKEND}
+ -DCRASHPAD_ZLIB_SYSTEM=ON
)
vcpkg_install_cmake()
diff --git a/ports/sentry-native/use-zlib-target.patch b/ports/sentry-native/use-zlib-target.patch new file mode 100644 index 000000000..d4b3dfca3 --- /dev/null +++ b/ports/sentry-native/use-zlib-target.patch @@ -0,0 +1,12 @@ +diff --git a/external/crashpad/CMakeLists.txt b/external/crashpad/CMakeLists.txt +index abb0697..a57ff04 100644 +--- a/external/crashpad/CMakeLists.txt ++++ b/external/crashpad/CMakeLists.txt +@@ -22,6 +22,7 @@ option(CRASHPAD_ZLIB_SYSTEM "Use system zlib library" "${CRASHPAD_ZLIB_SYSTEM_DE + + if(CRASHPAD_ZLIB_SYSTEM) + find_package(ZLIB REQUIRED) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) + endif() + + if(LINUX OR ANDROID) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index afbe40dc8..b60162f8c 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.11", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", @@ -8,6 +9,7 @@ { "name": "curl", "platform": "!windows" - } + }, + "zlib" ] } |