[ci] Use system zlib on all platforms and adapt tests and references to that#21654
Merged
dpiparo merged 3 commits intoroot-project:masterfrom Mar 23, 2026
Merged
[ci] Use system zlib on all platforms and adapt tests and references to that#21654dpiparo merged 3 commits intoroot-project:masterfrom
dpiparo merged 3 commits intoroot-project:masterfrom
Conversation
Test Results 22 files 22 suites 3d 6h 14m 3s ⏱️ Results for commit 30b9a2b. ♻️ This comment has been updated with latest results. |
dpiparo
force-pushed
the
adapt_to_zlibng
branch
7 times, most recently
from
dadccc6 to
db6d5c6
Compare
dpiparo
force-pushed
the
adapt_to_zlibng
branch
2 times, most recently
from
fa01308 to
8797ea5
Compare
hageboeck
requested changes
Mar 23, 2026
| list(APPEND ROOT_BUILTINS ZLIB) | ||
| add_subdirectory(builtins/zlib) | ||
| get_target_property(ZLIB_INCLUDE_DIR ZLIB::ZLIB INTERFACE_INCLUDE_DIRECTORIES) | ||
| get_target_property(ZLIB_LIBRARY_LOCATION ZLIB::ZLIB IMPORTED_LOCATION) |
Member
There was a problem hiding this comment.
Currently, this seems to be unused.
| if(builtin_zlib) | ||
| list(APPEND ROOT_BUILTINS ZLIB) | ||
| add_subdirectory(builtins/zlib) | ||
| get_target_property(ZLIB_INCLUDE_DIR ZLIB::ZLIB INTERFACE_INCLUDE_DIRECTORIES) |
Member
There was a problem hiding this comment.
To emulate what the find module would have created, one should spell it as ZLIB_INCLUDE_DIRS
Member
There was a problem hiding this comment.
This looks to have been added by accident; as for the other .orig .rej files in this folder.
test/stress.cxx
Outdated
Comment on lines
+335
to
+339
| // #ifdef R__HAS_ZLIB_NG | ||
| // auto comprSettings = CompressionSettings(ROOT::RCompressionSetting::EAlgorithm::k, 2); | ||
| // #else | ||
| // auto comprSettings = ROOT::RCompressionSetting::EDefaults::kUseCompiledDefault; | ||
| // #endif |
Member
There was a problem hiding this comment.
The comments can presumably be removed now.
1. with the R__HAS_ZLIB_NG preprocessor variable, that replaces R__HAS_CLOUDFLARE_ZLIB. 2. with the CMake variable ZLIB_NG that replaces ZLIB_CF
dpiparo
force-pushed
the
adapt_to_zlibng
branch
from
8797ea5 to
30b9a2b
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.