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

[vcpkg baseline][realm-core] Fix zlib lookup failure #38832

Merged
merged 4 commits into from
May 22, 2024
Merged

[vcpkg baseline][realm-core] Fix zlib lookup failure #38832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e05686
Fix zlib lookup failure
jimwang118 May 21, 2024
1c32d5d
update version
jimwang118 May 21, 2024
e5e4717
modify patch
jimwang118 May 21, 2024
22161e1
update version
jimwang118 May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/realm-core/fix-zlib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d5710f..c57e2dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,7 +331,6 @@ if(NOT APPLE AND NOT EMSCRIPTEN AND NOT TARGET ZLIB::ZLIB)
# We want to link against the stub library instead of statically linking anyway,
# so we hack find_library to only consider shared object libraries when looking for libz
set(_CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES})
- set(CMAKE_FIND_LIBRARY_SUFFIXES .so)
endif()
find_package(ZLIB REQUIRED)
if(ANDROID)
4 changes: 3 additions & 1 deletion ports/realm-core/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ vcpkg_from_github(
SHA512 "1bd11bfe70204213469687d1e224fabb2ff2798aa25f6d791b3d455acdcacf686248e7a692f23ed67148ef99faf1a7c1f823182f33a45340310477bc51b32bb7"
HEAD_REF "master"
PATCHES
"UWP_index_set.patch")
"UWP_index_set.patch"
fix-zlib.patch
)

set(REALMCORE_CMAKE_OPTIONS -DREALM_CORE_SUBMODULE_BUILD=OFF)
list(APPEND REALMCORE_CMAKE_OPTIONS -DREALM_BUILD_LIB_ONLY=ON)
Expand Down
4 changes: 3 additions & 1 deletion ports/realm-core/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "realm-core",
"version": "14.6.2",
"port-version": 1,
"description": "Realm is a mobile database that runs directly inside phones, tablets or wearables.",
"homepage": "https://github.com/realm/realm-core",
"license": "Apache-2.0",
Expand All @@ -17,6 +18,7 @@
{
"name": "vcpkg-cmake-config",
"host": true
}
},
"zlib"
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7638,7 +7638,7 @@
},
"realm-core": {
"baseline": "14.6.2",
"port-version": 0
"port-version": 1
},
"realsense2": {
"baseline": "2.54.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/realm-core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "102a758566531c3cc61b8803972dc950baacf946",
"version": "14.6.2",
"port-version": 1
},
{
"git-tree": "6c9e380d9d5239dcd4652be4a9794aaff74bd6e6",
"version": "14.6.2",
Expand Down