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

Remove internal flann #1495

Merged
merged 10 commits into from
Aug 1, 2023
Merged

Remove internal flann #1495

merged 10 commits into from
Aug 1, 2023

Conversation

servantftechnicolor
Copy link
Contributor

@servantftechnicolor servantftechnicolor commented Jul 25, 2023

Remove flann located inside alicevision repository to use an external one.
Updated CMakeLists to use non modified lz4 and flann.
Disable PCL as it is not used in AliceVision currently.

@servantftechnicolor servantftechnicolor force-pushed the dev/externalFlann branch 2 times, most recently from 3c52c36 to 251ae68 Compare July 27, 2023 15:31
@servantftechnicolor servantftechnicolor marked this pull request as ready for review July 28, 2023 08:20
@cbentejac cbentejac added this to the 3.2.0 milestone Jul 28, 2023
cbentejac
cbentejac previously approved these changes Aug 1, 2023
Copy link
Contributor

@cbentejac cbentejac left a comment

Choose a reason for hiding this comment

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

Tested on Windows and Linux, everything works as expected in both cases.

Copy link
Member

@simogasp simogasp left a comment

Choose a reason for hiding this comment

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

Flann can now only be used as an external dependency hence the following
updates:
- It is removed from the list of internal dependencies, and the AV fork
is linked instead;
- It is explicitly added to the list of packages to install with vcpkg (in
reality, it was already installed without being explicitly requested);
- Any reference to Flann being either internal or external is removed.
@cbentejac cbentejac dismissed simogasp’s stale review August 1, 2023 12:26

Done: the documentation has been updated.

@cbentejac cbentejac merged commit 8408e2d into develop Aug 1, 2023
@cbentejac cbentejac deleted the dev/externalFlann branch August 1, 2023 13:10
@cbentejac cbentejac linked an issue Aug 9, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove internal flann
3 participants