mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:59:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[popsift] fix copy tools (#17954)

Browse Source 
* [popsift] vcpkg_check_features use FEATURES as required

* [popsift] fix copy tools

* [popsift] update port version to 2

* [popsift] update port version to 2

* [popsift] remove useless variable

* [popsift] formatting

* [popsift] using ${PORT}

* [popsift] update port version to 2
This commit is contained in:
Simone Gasparini 2021-05-21 09:46:25 +02:00 committed by GitHub
parent 0ea963c7e7
commit 094e58f2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/popsift/portfile.cmake
View File

@ -12,13 +12,15 @@ vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT)
message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
apps PopSift_BUILD_EXAMPLES
FEATURES
apps PopSift_BUILD_EXAMPLES
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS} -DCUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT}
OPTIONS ${FEATURE_OPTIONS}
-DCUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT}
)
vcpkg_install_cmake()
@ -29,13 +31,9 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
# move the bin direcory to tools
# copy the apps in tools directory
if ("apps" IN_LIST FEATURES)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" ${CURRENT_PACKAGES_DIR}/tools/popsift)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
# file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin" ${CURRENT_PACKAGES_DIR}/tools/popsift/debug)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/popsift)
vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN)
endif()
file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/popsift RENAME copyright)
file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/popsift/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "popsift",
"version-string": "0.9",
"port-version": 1,
"port-version": 2,
"description": "PopSift is an implementation of the SIFT algorithm in CUDA.",
"homepage": "https://github.com/alicevision/popsift",
"supports": "!(uwp | arm | arm64 | android | x86)",

2
versions/baseline.json
View File

@ -4890,7 +4890,7 @@
},
"popsift": {
"baseline": "0.9",
"port-version": 1
"port-version": 2
},
"portable-snippets": {
"baseline": "2019-09-20",

5
versions/p-/popsift.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c4901cdc3f98676dba684b75fd292b6570a46d35",
"version-string": "0.9",
"port-version": 2
},
{
"git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d",
"version-string": "0.9",