diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-15 04:28:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 13:28:52 -0700 |
| commit | 3639676313a3e8b6fe1e94b9e7917b71d32511e3 (patch) | |
| tree | 03943cd07f1649323c638496437bb55a78f9e574 | |
| parent | f44fb85b341b8f58815b95c84d8488126b251570 (diff) | |
| download | vcpkg-3639676313a3e8b6fe1e94b9e7917b71d32511e3.tar.gz vcpkg-3639676313a3e8b6fe1e94b9e7917b71d32511e3.zip | |
[vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path (#17277)
* [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path
* update version record
| -rw-r--r-- | ports/popsift/CONTROL | 11 | ||||
| -rw-r--r-- | ports/popsift/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/popsift/vcpkg.json | 22 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/popsift.json | 5 |
5 files changed, 29 insertions, 13 deletions
diff --git a/ports/popsift/CONTROL b/ports/popsift/CONTROL deleted file mode 100644 index 038e8fb7e..000000000 --- a/ports/popsift/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: popsift -Version: 0.9 -Port-Version: 0 -Description: PopSift is an implementation of the SIFT algorithm in CUDA. -Build-Depends: cuda -Homepage: https://github.com/alicevision/popsift -Supports: !(uwp|arm|arm64|android|x86) - -Feature: apps -Description: Application programs for popsift (detection and matching) -Build-Depends: boost-algorithm, boost-program-options, boost-filesystem, boost-system
\ No newline at end of file diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index f611efa0f..097ef5085 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -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}") diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json new file mode 100644 index 000000000..a1d708514 --- /dev/null +++ b/ports/popsift/vcpkg.json @@ -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" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 8ec59ecb7..1505f651b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4830,7 +4830,7 @@ }, "popsift": { "baseline": "0.9", - "port-version": 0 + "port-version": 1 }, "portable-snippets": { "baseline": "2019-09-20", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index cf040e4c3..f5e2bed83 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d", + "version-string": "0.9", + "port-version": 1 + }, + { "git-tree": "807871ff30d3f2e5f40fbe3ff72dde0254b30c8d", "version-string": "0.9", "port-version": 0 |