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

[vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path #17277

Merged
merged 2 commits into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions ports/popsift/CONTROL

This file was deleted.

2 changes: 1 addition & 1 deletion ports/popsift/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ vcpkg_from_github(
HEAD_REF develop
)

include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake)
include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake)
vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT)

message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}")
Expand Down
22 changes: 22 additions & 0 deletions ports/popsift/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "popsift",
"version-string": "0.9",
"port-version": 1,
"description": "PopSift is an implementation of the SIFT algorithm in CUDA.",
"homepage": "https://github.com/alicevision/popsift",
"supports": "!(uwp | arm | arm64 | android | x86)",
"dependencies": [
"cuda"
],
"features": {
"apps": {
"description": "Application programs for popsift (detection and matching)",
"dependencies": [
"boost-algorithm",
"boost-filesystem",
"boost-program-options",
"boost-system"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4830,7 +4830,7 @@
},
"popsift": {
"baseline": "0.9",
"port-version": 0
"port-version": 1
},
"portable-snippets": {
"baseline": "2019-09-20",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/popsift.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d",
"version-string": "0.9",
"port-version": 1
},
{
"git-tree": "807871ff30d3f2e5f40fbe3ff72dde0254b30c8d",
"version-string": "0.9",
Expand Down