Skip to content
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

Explicitly disable the configure command for eigen (ext) #115

Merged
merged 4 commits into from
Sep 23, 2024

Conversation

m-aXimilian
Copy link
Contributor

@m-aXimilian m-aXimilian commented Sep 22, 2024

Description

Building with clang (tested with version 18.1.0rc) yields an error in the configuration step of the external eigen package.
Explicitly disabling this (it is implicitly skipped when building with msvc) solves this problem and the project builds fine with clang on windows.

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Locally tested using clang from the official LLVM releases. Configuring the project with export CC=$(which clang) && export CXX=$(which clang++) && cmake -B build -S . -G Ninja (ensuring the which clang and which clang++ calls point to the correct locations of the compilers).
I've tested both, Release and Debug configurations + used this fork in an external project that includes libczi via FetchContent_Declare.

Checklist:

  • I followed the Contributing Guidelines.
  • I did a self-review.
  • I commented my code, particularly in hard-to-understand areas.
  • I updated the documentation.
  • I updated the version of libCZI following Versioning of libCZI depending on the type of change
    • Bug fix -> PATCH
    • New feature -> MINOR
    • Breaking change -> MAJOR
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.

Copy link

codecov bot commented Sep 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.50%. Comparing base (ae6130d) to head (c4502be).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #115   +/-   ##
=======================================
  Coverage   65.50%   65.50%           
=======================================
  Files          86       86           
  Lines       10893    10893           
=======================================
  Hits         7136     7136           
  Misses       3757     3757           
Flag Coverage Δ
windows-latest 65.50% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ptahmose ptahmose added the cla Contributor License Agreement sent to Admin label Sep 22, 2024
ptahmose
ptahmose previously approved these changes Sep 22, 2024
Copy link
Contributor

@ptahmose ptahmose left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

I am undecided whether the version number of libCZI should be bumped or not. So far I went with the rule "if in doubt, increment the patch". I'm ok with both, but if you decide to change the version, don't forget to add a line to "version history" as well.

cmake/ExternalEIGEN3.cmake Outdated Show resolved Hide resolved
@m-aXimilian
Copy link
Contributor Author

I opted for incrementing the version number. It is for sure an arguably small and potentially harmless change, but it mingles with the build environment nonetheless. Therefore, I'd say it's good to have it documented in the version history.

@m-aXimilian m-aXimilian marked this pull request as ready for review September 22, 2024 19:55
Copy link
Contributor

@ptahmose ptahmose left a comment

Choose a reason for hiding this comment

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

Please fix version number in version-history.

Src/libCZI/Doc/version-history.markdown Outdated Show resolved Hide resolved
Co-authored-by: ptahmose <jbohl@h-quer.de>
Copy link
Contributor

@ptahmose ptahmose left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@m-aXimilian m-aXimilian merged commit 4df6b90 into ZEISS:main Sep 23, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla Contributor License Agreement sent to Admin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants