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.

Sign up for GitHub

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

Jump to bottom

[flann] Change from find_package(hdf5) to find_dependency(HDF5) #22731

Merged
merged 6 commits into from
Jan 26, 2022
Merged

[flann] Change from find_package(hdf5) to find_dependency(HDF5) #22731

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8df86cc
fix flann-config.cmake
longhuan2018 Jan 24, 2022
d04e852
update version
longhuan2018 Jan 24, 2022
5673c21
fix
longhuan2018 Jan 24, 2022
eecc457
Update flann.json
longhuan2018 Jan 24, 2022
77f5c85
Update vcpkg.json
longhuan2018 Jan 24, 2022
84a730c
Update flann.json
longhuan2018 Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/flann/fix-dependency-hdf5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ index e8bb3f766..ad33998d9 100644
include(CMakeFindDependencyMacro)
# Find lz4. This will create 'lz4::lz4' target
find_dependency(lz4)
+find_package(hdf5 REQUIRED)
+find_dependency(HDF5)

include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
check_required_components("flann")
12 changes: 9 additions & 3 deletions ports/flann/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
#the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg.

set(FLANN_PATCHES
fix-build-error.patch
)

if("hdf5" IN_LIST FEATURES)
list(APPEND FLANN_PATCHES fix-dependency-hdf5.patch)
endif()
longhuan2018 marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO flann-lib/flann
REF 1d04523268c388dabf1c0865d69e1b638c8c7d9d
SHA512 61e322222c2daa0b9677095e5ca231cba7c305ce754ad8e659eee350111c1e04351181c3af04e45ab6e5c9edea49c7b9ec6499bb0dbc080b87af36eb11c6ef7c
HEAD_REF master
PATCHES
fix-build-error.patch
fix-dependency-hdf5.patch
PATCHES ${FLANN_PATCHES}
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion ports/flann/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flann",
"version-date": "2019-04-07",
"port-version": 4,
"port-version": 5,
"description": "Fast Library for Approximate Nearest Neighbors",
"homepage": "https://github.com/mariusmuja/flann",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,7 +2178,7 @@
},
"flann": {
"baseline": "2019-04-07",
"port-version": 4
"port-version": 5
},
"flash-runtime-extensions": {
"baseline": "2.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/flann.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a6baa015795bdf568ec41a125e5ce1422927b5c6",
"version-date": "2019-04-07",
"port-version": 5
},
{
"git-tree": "9ceb0dabb980c9cdfb5d9cf1a23e66ec90e75285",
"version-date": "2019-04-07",
Expand Down