Skip to content

Minor CMake Update - #157

Merged
nmwsharp merged 3 commits into
nmwsharp:masterfrom
qnzhou:master
Jun 5, 2023
Merged

Minor CMake Update#157
nmwsharp merged 3 commits into
nmwsharp:masterfrom
qnzhou:master

Conversation

@qnzhou

@qnzhou qnzhou commented Jun 2, 2023

Copy link
Copy Markdown
Contributor

Summary:

To make geometry-central more friendly as a dependency, the following cmake changes are added:

  • Avoid building nanort, nanoflann and happly if the correspoinding cmake targets already exist.
  • Move nanoflann.h out of the nanoflann directory as this is case in the original nanoflann repo. This makes geometry-central compatible with repos which interface with nanoflann directly.

@nmwsharp

nmwsharp commented Jun 5, 2023

Copy link
Copy Markdown
Owner

Thanks for submitting! These all look good to me.

One minor request: I think the nanoflann/nanoflann.hpp --> nanoflann.hpp change could be a small breaking change for projects that included the file from the old location. It's silly, but does it sound reasonable to add a symlink at the old location just so there isn't a needless breaking change?

@qnzhou

qnzhou commented Jun 5, 2023

Copy link
Copy Markdown
Contributor Author

does it sound reasonable to add a symlink at the old location just so there isn't a needless breaking change?

Yes, I have updated the cmake to make a symlink so #include <nanoflann/nanoflann.hpp> will still work. :)

@nmwsharp
nmwsharp merged commit 631b9e6 into nmwsharp:master Jun 5, 2023
@nmwsharp

nmwsharp commented Jun 5, 2023

Copy link
Copy Markdown
Owner

thank you!! merged

@qnzhou qnzhou mentioned this pull request Sep 16, 2025
designbynumbers pushed a commit to designbynumbers/geometry-central that referenced this pull request Jul 1, 2026
* Minor cmake update.

* Move nanoflann.h to canonical location.

* Backward compatibility update.
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