Skip to content

Update zlib and minizip#4

Merged
peterNordin merged 8 commits into
robbr48:mainfrom
peterNordin:update_zlib_and_minizip
May 24, 2022
Merged

Update zlib and minizip#4
peterNordin merged 8 commits into
robbr48:mainfrom
peterNordin:update_zlib_and_minizip

Conversation

@peterNordin
Copy link
Copy Markdown
Collaborator

@peterNordin peterNordin commented May 14, 2022

  • Update to the latest versions (not NG versions) of zlib and minizip
  • Most of the additional modifications made to minizip in FMILibrary version were reapplied to this newer version
  • Also changed FMI4C CMake option names to avoid (hopefully) confusion
  • Add initial version of github actions CI configuration

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
@peterNordin peterNordin requested a review from robbr48 May 14, 2022 12:34
@peterNordin peterNordin force-pushed the update_zlib_and_minizip branch from a13bed4 to 27503b2 Compare May 14, 2022 14:52
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
@peterNordin peterNordin force-pushed the update_zlib_and_minizip branch from 27503b2 to 7cdd72c Compare May 14, 2022 15:03
@peterNordin peterNordin force-pushed the update_zlib_and_minizip branch from 1db889d to 403c75b Compare May 14, 2022 18:29
@peterNordin peterNordin merged commit 9c42d17 into robbr48:main May 24, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants