diff options
| author | Simone Gasparini <simone.gasparini@gmail.com> | 2021-05-21 09:46:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 00:46:25 -0700 |
| commit | 094e58f2b01a6bf257412aba433fca3e2f638be8 (patch) | |
| tree | 5f5c3b59c74e1442f2c4c4b85dc445e6eafa4652 | |
| parent | 0ea963c7e79727d3b0b3f2996a9d571bf67124df (diff) | |
| download | vcpkg-094e58f2b01a6bf257412aba433fca3e2f638be8.tar.gz vcpkg-094e58f2b01a6bf257412aba433fca3e2f638be8.zip | |
[popsift] fix copy tools (#17954)
* [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
| -rw-r--r-- | ports/popsift/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/popsift/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/popsift.json | 5 |
4 files changed, 14 insertions, 11 deletions
diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index 097ef5085..a0269235f 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -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)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json index a1d708514..aed5386b8 100644 --- a/ports/popsift/vcpkg.json +++ b/ports/popsift/vcpkg.json @@ -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)", diff --git a/versions/baseline.json b/versions/baseline.json index a6cdae61d..01cdff6c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4890,7 +4890,7 @@ }, "popsift": { "baseline": "0.9", - "port-version": 1 + "port-version": 2 }, "portable-snippets": { "baseline": "2019-09-20", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index f5e2bed83..f2f024bbb 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c4901cdc3f98676dba684b75fd292b6570a46d35", + "version-string": "0.9", + "port-version": 2 + }, + { "git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d", "version-string": "0.9", "port-version": 1 |