Skip to content

Enable msvc build#2

Merged
peterNordin merged 10 commits into
robbr48:mainfrom
peterNordin:enable_msvc_build
May 1, 2022
Merged

Enable msvc build#2
peterNordin merged 10 commits into
robbr48:mainfrom
peterNordin:enable_msvc_build

Conversation

@peterNordin
Copy link
Copy Markdown
Collaborator

Various change to enable build with MSVC
Add option to force use of included zlib, version found in system is used otherwise.
I not found, the included version if build by default (for MSVC). It is build as a static library in this case.

@peterNordin peterNordin requested a review from robbr48 April 20, 2022 20:52
@peterNordin
Copy link
Copy Markdown
Collaborator Author

peterNordin commented Apr 20, 2022

@robbr48 When you review, have a careful look at ee70b13. I do know what the correct version is, i just changed them to make the compiler happier.
Also review per commit, the last two commits renamed and restyled the fmi4c header so it looks like a lot of changes.

Copy link
Copy Markdown
Owner

@robbr48 robbr48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I finally looked through it, and everything looks good as far as I can see. fmi4c.h is very hard to review since more or less everything has changed, but I assume it is mostly about replacing FMIC_DLLEXPORT.

@peterNordin
Copy link
Copy Markdown
Collaborator Author

Yes the last tow commits were indentation changes and renamed the export macro

@peterNordin peterNordin merged commit 4791394 into robbr48:main May 1, 2022
@peterNordin peterNordin deleted the enable_msvc_build branch May 1, 2022 08:17
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