-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[flann] Update to 2022-10-28 #44076
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
Merged
Javier Matos Denizac (JavierMatosD)
merged 10 commits into
microsoft:master
from
jimwang118:up-flann
Mar 7, 2025
Merged
[flann] Update to 2022-10-28 #44076
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3d16905
update to 2022-10-28
jimwang118 b040b7f
update version
jimwang118 4afeb14
remove bin
jimwang118 33a200c
update version
jimwang118 e4d8920
fix pathc
jimwang118 a30da62
update version
jimwang118 7df1367
fix patch
jimwang118 6042f2c
update version
jimwang118 1d15f3e
fix dep flann
jimwang118 20ebcde
update version
jimwang118 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 5fd73ba..ff357f2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -155,8 +155,8 @@ if (BUILD_CUDA_LIB) | ||
| endif(CUDA_FOUND) | ||
| endif(BUILD_CUDA_LIB) | ||
|
|
||
| -find_package(PkgConfig REQUIRED) | ||
| -pkg_check_modules(LZ4 REQUIRED liblz4) | ||
| +find_package(lz4 CONFIG REQUIRED) | ||
| +set(LZ4_LINK_LIBRARIES lz4::lz4) | ||
| include_directories(${LZ4_INCLUDE_DIRS}) | ||
|
|
||
| #set the C/C++ include path to the "include" directory | ||
| diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in | ||
| index 6b95a71..d78c74a 100644 | ||
| --- a/cmake/Config.cmake.in | ||
| +++ b/cmake/Config.cmake.in | ||
| @@ -1,5 +1,10 @@ | ||
| @PACKAGE_INIT@ | ||
|
|
||
| +include(CMakeFindDependencyMacro) | ||
| +find_dependency(lz4 CONFIG) | ||
| +if(@WITH_HDF5@) | ||
| + find_dependency(HDF5 CONFIG) | ||
| +endif() | ||
| include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") | ||
| check_required_components("flann") | ||
|
|
||
| diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt | ||
| index 7603abc..ce9fc40 100644 | ||
| --- a/src/cpp/CMakeLists.txt | ||
| +++ b/src/cpp/CMakeLists.txt | ||
| @@ -18,8 +18,11 @@ if (CMAKE_BUILD_STATIC_LIBS) | ||
| else() | ||
| set_target_properties(flann_cpp_s PROPERTIES EXCLUDE_FROM_ALL true) | ||
| endif() | ||
| - | ||
| -add_library(flann_cpp SHARED ${CPP_SOURCES}) | ||
| +if(CMAKE_BUILD_STATIC_LIBS) | ||
| + add_library(flann_cpp STATIC ${CPP_SOURCES}) | ||
| +else() | ||
| + add_library(flann_cpp SHARED ${CPP_SOURCES}) | ||
| +endif() | ||
| target_link_libraries(flann_cpp ${LZ4_LINK_LIBRARIES}) | ||
| # export lz4 headers, so that MSVC to creates flann_cpp.lib | ||
| set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) | ||
| @@ -91,8 +94,11 @@ if (BUILD_C_BINDINGS) | ||
| else() | ||
| set_target_properties(flann_s PROPERTIES EXCLUDE_FROM_ALL true) | ||
| endif() | ||
| - | ||
| - add_library(flann SHARED ${C_SOURCES}) | ||
| + if(CMAKE_BUILD_STATIC_LIBS) | ||
| + add_library(flann STATIC ${C_SOURCES}) | ||
| + else() | ||
| + add_library(flann SHARED ${C_SOURCES}) | ||
| + endif() | ||
| target_link_libraries(flann ${LZ4_LINK_LIBRARIES}) | ||
| list(APPEND flann_install_targets flann) | ||
|
|
||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.