[dep] add PCL as dependency #1258
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
p12tic
reviewed
Oct 3, 2022
p12tic
previously approved these changes
Oct 3, 2022
p12tic
previously approved these changes
Oct 3, 2022
|
Thanks. I will merge it for now, but it would be great to replace the internal flann soon to avoid version conflicts. |
fabiencastan
reviewed
Oct 6, 2022
CMakeLists.txt
Outdated
| ${LZ4_CMAKE_FLAGS} | ||
| -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR> | ||
| BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} | ||
| DEPENDS ${FLANN_TARGET} ${LZ4_TARGET} ${EIGEN_TARGET} ${BOOST_TARGET} ${PNG_TARGET} |
There was a problem hiding this comment.
Suggested change
| DEPENDS ${FLANN_TARGET} ${LZ4_TARGET} ${EIGEN_TARGET} ${BOOST_TARGET} ${PNG_TARGET} | |
| DEPENDS ${FLANN_TARGET} ${LZ4_TARGET} ${EIGEN_TARGET} ${BOOST_TARGET} ${PNG_TARGET} ${CUDA_TARGET} |
fabiencastan
reviewed
Oct 6, 2022
CMakeLists.txt
Outdated
Comment on lines
933
to
934
| ${CUDA_CMAKE_FLAGS} | ||
| -DWITH_CUDA:BOOL=OFF |
There was a problem hiding this comment.
it's not required for the registration module in pcl, that's why I set it to off.
I can put
Suggested change
| ${CUDA_CMAKE_FLAGS} | |
| -DWITH_CUDA:BOOL=OFF | |
| ${CUDA_CMAKE_FLAGS} | |
| -DWITH_CUDA:BOOL=${AV_USE_CUDA} |
so that it is coherent with rest?
There was a problem hiding this comment.
My point was just that you added ${CUDA_CMAKE_FLAGS} which does not make sense if you disable cuda usage.
There was a problem hiding this comment.
But yes, if we enable it as it's done now, that makes sense.
fabiencastan
approved these changes
Oct 7, 2022
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a pre-requisite for the registration module that will be added by #425 .
It adds the CMake scripts to build PCL as a dependency as well as its own dependencies that were not already included in our scripts, flann and lz4.
It also add pcl among the dependencies to build in CI
Implementation remarks
Flann and lz4 do not have a CMake build system but it has been added in vcpkg. In order to use proper CMake configurations 2 forks of the projects have been generated with CMake build systems inspired by those of vcpkg, https://github.com/alicevision/flann and https://github.com/alicevision/lz4.
Lz4 can be consumed as
lz4::lz4, flann asflann::flann_cppand pcl with${PCL_LIBRARIES}NB
Flann at the moment is an embedded dependency of the project. The moment we will take it out and use it as an external dependency, the script should be modified to include flann and lz4 (its dependency) as a mandatory dependency.