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

[Cgal plugin] Fix windows cmake dll path and add a scene example #958

Merged
merged 4 commits into from
Sep 18, 2019

Conversation

epernod
Copy link
Contributor

@epernod epernod commented Mar 7, 2019

  • Not sure this is the good way to do it with cmake findCGal but otherwise the dll are not linked (if not on env_path)

  • Add a quick scene test for cgal without image plugin.


This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@epernod epernod self-assigned this Mar 7, 2019
@epernod epernod added the pr: status to review To notify reviewers to review this pull-request label Mar 7, 2019
@guparan guparan added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Mar 13, 2019
@guparan
Copy link
Contributor

guparan commented Mar 19, 2019

So I tried to play a bit with CGALPlugin and realized we can use CGAL in header-only mode. So, why should we copy some dlls?
I made a branch here: https://github.com/guparan/sofa/tree/clean_cgalplugin_cmake

EDIT: here is a patch to try my changes in this branch: cgal-plugin_fix.patch.txt

@guparan guparan added pr: status to review To notify reviewers to review this pull-request pr: status wip Development in the pull-request is still in progress and removed pr: status wip Development in the pull-request is still in progress pr: status to review To notify reviewers to review this pull-request labels Mar 20, 2019
@guparan
Copy link
Contributor

guparan commented Mar 26, 2019

Did you have some time to test my patch @epernod ?

@epernod
Copy link
Contributor Author

epernod commented Mar 26, 2019

ok, it works if I don't build cgal, so in header only (only execute cgal-setup.exe, no visual build after this step)
Otherwise it fails at compilation: error: cannot open input file 'CGal.lib' when building plugin.

@guparan
Copy link
Contributor

guparan commented Mar 27, 2019

Header only usage should work even if CGAL has been built before. I will try to force header_only, there is a CMake variable for that in CGAL.

@epernod
Copy link
Contributor Author

epernod commented Aug 26, 2019

@guparan do you remember what is the status of CGal plugin config on windows?

@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Sep 11, 2019
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Sep 18, 2019
@guparan guparan merged commit 5f7b1fb into sofa-framework:master Sep 18, 2019
@epernod epernod deleted the cgal-plugin_fix branch September 20, 2019 15:15
@guparan guparan added this to the v19.12 milestone Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants