Update zlib and minizip#4
Merged
Merged
Conversation
Subset of files copied from https://github.com/madler/zlib Commit: 21767c654d31d2dccdde4330529775c6c5fd5389
From https://github.com/madler/zlib/tree/master/contrib/minizip Commit: 21767c654d31d2dccdde4330529775c6c5fd5389 Excluding build related files, as it will be built directly into fmi4c
a13bed4 to
27503b2
Compare
The previous version was copied from FMILibrary and contained additional changes, this commit reapplies most of those changes on the newest minizip version
And removed from source tree which causes a modification when built
Avoids mixup with CMake options from zlib Makes it more clear wich are Fmi4c specific
27503b2 to
7cdd72c
Compare
1db889d to
403c75b
Compare
robbr48
approved these changes
May 18, 2022
slitvinov
added a commit
to slitvinov/fmi4c
that referenced
this pull request
May 2, 2026
Without this, test FMUs are written to binaries/linux64 (FMI 1/2) or binaries/x86_64-linux (FMI 3) on macOS, while the patched fmi4c reader correctly looks under binaries/darwin64 / aarch64-darwin. With this commit and the reader fix applied, all 6 ctest cases pass on macOS 26.4.1 arm64 (Apple M5): Test #1: fmi1cs ........... Passed 1.05 sec Test robbr48#2: fmi1me ........... Passed 0.36 sec Test robbr48#3: fmi2cs ........... Passed 0.44 sec Test robbr48#4: fmi2me ........... Passed 0.46 sec Test robbr48#5: fmi3cs ........... Passed 0.42 sec Test robbr48#6: fmi3me ........... Passed 0.33 sec 100% tests passed, 0 tests failed out of 6
robbr48
pushed a commit
that referenced
this pull request
May 20, 2026
Without this, test FMUs are written to binaries/linux64 (FMI 1/2) or binaries/x86_64-linux (FMI 3) on macOS, while the patched fmi4c reader correctly looks under binaries/darwin64 / aarch64-darwin. With this commit and the reader fix applied, all 6 ctest cases pass on macOS 26.4.1 arm64 (Apple M5): Test #1: fmi1cs ........... Passed 1.05 sec Test #2: fmi1me ........... Passed 0.36 sec Test #3: fmi2cs ........... Passed 0.44 sec Test #4: fmi2me ........... Passed 0.46 sec Test #5: fmi3cs ........... Passed 0.42 sec Test #6: fmi3me ........... Passed 0.33 sec 100% tests passed, 0 tests failed out of 6
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
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.
Uh oh!
There was an error while loading. Please reload this page.