LZ4 dependency fix and CMake fix#523
Closed
AndersHogqvist wants to merge 6 commits intoflann-lib:masterfrom
Closed
LZ4 dependency fix and CMake fix#523AndersHogqvist wants to merge 6 commits intoflann-lib:masterfrom
AndersHogqvist wants to merge 6 commits intoflann-lib:masterfrom
Conversation
Serialization split into header and source file to avoid external dependency to LZ4 library. Also fixed linkage to LZ4 by changing variables used in CMakeLists.txt.
LZ4 dependency fix
HDF5 is only required if building tests. Also fixed so that both C and CPP static libraries are installed.
HDF5 only if building tests
The static libs now have the _s suffix as before.
Removed renaming static libs
Author
negril
reviewed
Jan 25, 2025
| message(WARNING "hdf5 library not found, some tests will not be run") | ||
| else() | ||
| include_directories(${HDF5_INCLUDE_DIR}) | ||
| if(BUILD_TESTS) |
There was a problem hiding this comment.
If you only include hdf5 iff you build tests, flann_mpi_server / flann_mpi_client from src/cpp/CMakeLists.txt#L71 and flann_example_cpp / flann_example_mpi from examples/CMakeLists.txt#L13 are never build unless you also build the tests.
Suggested change
| if(BUILD_TESTS) | |
| if(USE_HDF5) |
Something like this would follow the other options.
You'd also need to add this after L62:
option(USE_HDF5 "Use HDF5" OFF)
And this at the end.
message(STATUS "Using HDF5 support: ${USE_HDF5}")
message(STATUS "Using Parallel HDF5 support: ${HDF5_IS_PARALLEL}")
There was a problem hiding this comment.
Or you use something like:
Suggested change
| if(BUILD_TESTS) | |
| +if(BUILD_EXAMPLES OR BUILD_TESTS OR USE_MPI) |
zinovya
reviewed
Mar 31, 2025
| free(head); | ||
| } | ||
|
|
||
| void loadBlock(char *buffer_, size_t compSz, FILE *stream) { |
There was a problem hiding this comment.
should this be LoadArchive::loadBlock?
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Uh oh!
There was an error while loading. Please reload this page.