diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index 5cd577b4e2dd89..f745ad685a020c 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v${VERSION} SHA512 374a00542ff46ac8a8cf31b7a62c834e4e148c5f9ddd5f6a128e4284e637242c0ce55bf3ee6524e6555c8402332ec8863ca921cef36c0bacd9a1ada6c8e09b55 HEAD_REF develop + PATCHES + pr-183-add-zcpreprocessor-for-cuda-13-2.diff # https://github.com/alicevision/popsift/pull/183 ) vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) diff --git a/ports/popsift/pr-183-add-zcpreprocessor-for-cuda-13-2.diff b/ports/popsift/pr-183-add-zcpreprocessor-for-cuda-13-2.diff new file mode 100644 index 00000000000000..e34142f6886078 --- /dev/null +++ b/ports/popsift/pr-183-add-zcpreprocessor-for-cuda-13-2.diff @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 86fc3c1b..11cb5a6a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -49,6 +49,9 @@ target_link_libraries(popsift + set_target_properties(popsift PROPERTIES VERSION ${PROJECT_VERSION}) + set_target_properties(popsift PROPERTIES DEBUG_POSTFIX "d") + set_target_properties(popsift PROPERTIES CUDA_SEPARABLE_COMPILATION ON) ++if(MSVC) ++ target_compile_options(popsift PRIVATE $<$:-Xcompiler=/Zc:preprocessor>) ++endif() + + # build directory containing the automatically generated files + set(popsift_generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json index ff4af933e61b62..4bb8b70f9be19a 100644 --- a/ports/popsift/vcpkg.json +++ b/ports/popsift/vcpkg.json @@ -1,6 +1,7 @@ { "name": "popsift", "version": "0.10.0", + "port-version": 1, "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", "homepage": "https://github.com/alicevision/popsift", "documentation": "https://popsift.readthedocs.io/", diff --git a/versions/baseline.json b/versions/baseline.json index 256afed97694d5..30b3e519fadb87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7854,7 +7854,7 @@ }, "popsift": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "portable-file-dialogs": { "baseline": "0.1.0", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index bf8f92de9e1b9e..59680c22f85535 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24ec78a1eca98f407158ac08a43b923a5417849a", + "version": "0.10.0", + "port-version": 1 + }, { "git-tree": "ee43b750c42a10ab97cd677af23edd402867a13a", "version": "0.10.0",