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

Allow Clipper2 to be supplied externally when using Manifold as a submodule #1115

Merged
merged 3 commits into from
Dec 19, 2024

Conversation

kintel
Copy link
Contributor

@kintel kintel commented Dec 18, 2024

  • Checks Clipper2_FOUND before attempting to find Clipper2
  • Add imported Clipper2 library only when trying pkg_config

Copy link

codecov bot commented Dec 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.54%. Comparing base (926d2e7) to head (567637f).
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1115      +/-   ##
==========================================
+ Coverage   91.46%   91.54%   +0.07%     
==========================================
  Files          30       30              
  Lines        5908     5904       -4     
==========================================
+ Hits         5404     5405       +1     
+ Misses        504      499       -5     

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

@elalish elalish requested a review from pca006132 December 18, 2024 17:08
@elalish
Copy link
Owner

elalish commented Dec 18, 2024

What are you waiting for to make this not a Draft?

@kintel
Copy link
Contributor Author

kintel commented Dec 18, 2024

What are you waiting for to make this not a Draft?

My own manual testing across platforms, which takes some time. I mostly wanted to make sure this is conceptually ok with you, plus make sure Manifold's tests pass.

@kintel kintel mentioned this pull request Dec 19, 2024
26 tasks
@kintel kintel marked this pull request as ready for review December 19, 2024 03:49
@kintel
Copy link
Contributor Author

kintel commented Dec 19, 2024

This is good to go now!

@pca006132
Copy link
Collaborator

LGTM. I'm wondering if we should do something similar for other dependencies, e.g. tbb.

@kintel
Copy link
Contributor Author

kintel commented Dec 19, 2024

Yeah, it could make sense to align the deps lookups. I didn't run into the same issue with tbb as we're always supplying it as a system dependency from the OpenSCAD side.

@kintel
Copy link
Contributor Author

kintel commented Dec 19, 2024

Another idea would be to hide all the details in custom Find macros, but I didn't want to touch too much as it's so time consuming to test it..

@pca006132
Copy link
Collaborator

We typically just write some simple test in our CI, like https://github.com/elalish/manifold/blob/master/scripts/test-cmake-subdir.sh

It should not be too hard to test. I can have a look at it later, and probably deal with #1105. Our CI jobs will probably grow by 5... I'm starting to think if we are kind of abusing GitHub action :P

Copy link
Owner

@elalish elalish left a comment

Choose a reason for hiding this comment

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

Thanks!

@elalish elalish merged commit f48111c into elalish:master Dec 19, 2024
25 checks passed
@elalish elalish mentioned this pull request Dec 26, 2024
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.

3 participants