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

Omit zlib on windows #3787

Merged
merged 2 commits into from
Jun 7, 2021
Merged

Omit zlib on windows #3787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02688d0
Add zlib only when not on windows
kraenhansen Jun 4, 2021
0322bde
Adding a note to the changelog
kraenhansen Jun 7, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ NOTE: Bump file format version to 21. NO DOWNGRADE PATH IS AVAILABLE.
* Upgraded to Realm Core from v11.0.0-beta.5 to v11.0.0-beta.6.
* Added npm script to generate internal Doxygen documentation.
* Removed private methods `Realm._objectForObjectId()` and `Realm.Object._objectId()`.
* Omitting zlib when building for Windows, to avoid clashing with the zlib provided by the platform (Node.js / Electron). ([#3787](https://github.com/realm/realm-js/pull/3787))

10.5.0-beta.2 Release notes (2021-5-12)
=============================================================
Expand Down
4 changes: 3 additions & 1 deletion cmake/NodeJSTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ target_link_libraries(NodeJS INTERFACE ${CMAKE_JS_LIB})

# Node.js exports the zlib headers and symbols, so use those
# realm-core depends on the ZLIB::ZLIB target - if we don't define it ourselves it'll search globally for a zlib library
add_library(ZLIB::ZLIB ALIAS NodeJS)
if(NOT WIN32)
add_library(ZLIB::ZLIB ALIAS NodeJS)
endif()