-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
Update ZLib 3rdparty library to use ZLib-ng and Minizip-ng so patching is not necessary #7022
Draft
dbs4261
wants to merge
14
commits into
isl-org:main
Choose a base branch
from
dbs4261:zlib-ng
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3beaefd
Added missing build byproduct for BoringSSL
dbs4261 9aeddae
Added missing build byproduct for libcurl
dbs4261 19740df
Added missing build byproduct for ipp
dbs4261 f4d452a
Fixed incorrect build byproduct for UVAtlas
dbs4261 cc330c5
Added missing build byproduct for VTK
dbs4261 5714a05
Fixed invalid generator expression on non-windows platforms
dbs4261 0f7e43d
Added missing CMAKE_STATIC_LIBRARY_PREFIX
dbs4261 10d0b15
Fix downloaded vtk build byproducts
dbs4261 3637d13
Merge branch 'refs/heads/main' into missing-build-byproducts
dbs4261 3325a55
Extracted minizip from zlib so that an external zlib could be used in…
dbs4261 e831313
Merge branch 'main' into zlib-ng
dbs4261 6de1aa4
Updated options to remove WITH_MINIZIP and instead use USE_SYSTEM_MIN…
dbs4261 dc898f7
Updated CHANGELOG.md in reference to PR #7022
dbs4261 557118c
Added missing build byproduct to minizip.cmake
dbs4261 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
include(ExternalProject) | ||
|
||
find_package(Git QUIET REQUIRED) | ||
|
||
ExternalProject_Get_Property(ext_zlib INSTALL_DIR) | ||
set(ZLIB_INSTALL_DIR ${INSTALL_DIR}) | ||
unset(INSTALL_DIR) | ||
|
||
set(lib_name minizip) | ||
|
||
ExternalProject_Add(ext_minizip | ||
PREFIX minizip-ng | ||
URL https://github.com/zlib-ng/minizip-ng/archive/refs/tags/4.0.7.tar.gz | ||
URL_HASH SHA256=a87f1f734f97095fe1ef0018217c149d53d0f78438bcb77af38adc21dff2dfbc | ||
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/minizip-ng" | ||
CMAKE_ARGS | ||
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> | ||
-DMZ_COMPAT:BOOL=ON | ||
-DMZ_ZLIB:BOOL=ON | ||
-DMZ_BZIP2:BOOL=OFF | ||
-DMZ_LZMA:BOOL=OFF | ||
-DMZ_ZSTD:BOOL=OFF | ||
-DMZ_LIBCOMP:BOOL=OFF | ||
-DMZ_FETCH_LIBS:BOOL=OFF | ||
-DMZ_FORCE_FETCH_LIBS:BOOL=OFF | ||
-DMZ_PKCRYPT:BOOL=OFF | ||
-DMZ_WZAES:BOOL=OFF | ||
-DMZ_OPENSSL:BOOL=OFF | ||
-DMZ_LIBBSD:BOOL=OFF | ||
-DMZ_ICONV:BOOL=OFF | ||
-DZLIB_ROOT:PATH=${ZLIB_INSTALL_DIR} | ||
${ExternalProject_CMAKE_ARGS} | ||
BUILD_BYPRODUCTS | ||
<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX} | ||
) | ||
|
||
ExternalProject_Get_Property(ext_minizip INSTALL_DIR) | ||
set(MINIZIP_INCLUDE_DIRS ${INSTALL_DIR}/include/minizip/) # "/" is critical. | ||
set(MINIZIP_LIB_DIR ${INSTALL_DIR}/lib) | ||
set(MINIZIP_LIBRARIES ${lib_name}) |
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
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think You should set
USE_SYSTEM_ZLIB
toOFF
if the package can't be found.