Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[zlib] Add cmake wrapper #18914

Merged
merged 7 commits into from
Jul 26, 2021
Merged

[zlib] Add cmake wrapper #18914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1943ed2
Format manifest
dg0yt Jul 11, 2021
6375714
Add cmake wrapper
dg0yt Jul 11, 2021
06afd99
x-add-version
dg0yt Jul 11, 2021
fc193f5
Always use vcpkg zlib for sentry native
dg0yt Jul 12, 2021
41c3c83
x-add-version
dg0yt Jul 12, 2021
9bae98d
Fix and simplify wrapper
dg0yt Jul 12, 2021
8eb360b
Update git-tree
dg0yt Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/sentry-native/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
12 changes: 12 additions & 0 deletions ports/sentry-native/use-zlib-target.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 3 additions & 1 deletion ports/sentry-native/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"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)",
"dependencies": [
{
"name": "curl",
"platform": "!windows"
}
},
"zlib"
]
}
5 changes: 0 additions & 5 deletions ports/zlib/CONTROL
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ports/zlib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ vcpkg_configure_cmake(
)

vcpkg_install_cmake()
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

# Install the pkgconfig file
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
Expand Down
13 changes: 13 additions & 0 deletions ports/zlib/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
set(ZLIB_ROOT "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${ZLIB_ROOT}/include" NO_DEFAULT_PATH)
find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${ZLIB_ROOT}/lib" NO_DEFAULT_PATH)
find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${ZLIB_ROOT}/debug/lib" NO_DEFAULT_PATH)
if(NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY_RELEASE OR (NOT ZLIB_LIBRARY_DEBUG AND EXISTS "${ZLIB_ROOT}/debug/lib"))
message("Broken installation of vcpkg port zlib")
endif()
if(CMAKE_VERSION VERSION_LESS 3.4)
include(SelectLibraryConfigurations)
select_library_configurations(ZLIB)
unset(ZLIB_FOUND)
endif()
_find_package(${ARGS})
7 changes: 7 additions & 0 deletions ports/zlib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "zlib",
"version-string": "1.2.11",
"port-version": 11,
"description": "A compression library",
"homepage": "https://www.zlib.net/"
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5722,7 +5722,7 @@
},
"sentry-native": {
"baseline": "0.4.11",
"port-version": 0
"port-version": 1
},
"septag-sx": {
"baseline": "2019-05-07-2",
Expand Down Expand Up @@ -6850,7 +6850,7 @@
},
"zlib": {
"baseline": "1.2.11",
"port-version": 10
"port-version": 11
},
"zlib-ng": {
"baseline": "2.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sentry-native.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a2864f84fc6ef423bcc641b64b75cc574df99b85",
"version-semver": "0.4.11",
"port-version": 1
},
{
"git-tree": "8343307e093e40faaf7e894be6aed4f60cb327d0",
"version-semver": "0.4.11",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zlib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ad5b59cd3722af26f09921297562dfc76c83dbf8",
"version-string": "1.2.11",
"port-version": 11
},
{
"git-tree": "53a4615c8bb9b98a3864b834a6bbe51cc6c849ef",
"version-string": "1.2.11",
Expand Down