[popsift] Fix CUDA 13.2. (#51456)

BillyONeal · web-flow · commit eb8b7b7ce1c3 · 2026-04-29T22:57:43.000Z
diff --git 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
@@ -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 $<$<COMPILE_LANGUAGE:CUDA>:-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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "24ec78a1eca98f407158ac08a43b923a5417849a",
+      "version": "0.10.0",
+      "port-version": 1
+    },
     {
       "git-tree": "ee43b750c42a10ab97cd677af23edd402867a13a",
       "version": "0.10.0",

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ vcpkg_from_github(`
`4`	`4`	`REF v${VERSION}`
`5`	`5`	`SHA512 374a00542ff46ac8a8cf31b7a62c834e4e148c5f9ddd5f6a128e4284e637242c0ce55bf3ee6524e6555c8402332ec8863ca921cef36c0bacd9a1ada6c8e09b55`
`6`	`6`	`HEAD_REF develop`
	`7`	`+ PATCHES`
	`8`	`+ pr-183-add-zcpreprocessor-for-cuda-13-2.diff # https://github.com/alicevision/popsift/pull/183`
`7`	`9`	`)`
`8`	`10`
`9`	`11`	`vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "popsift",`
`3`	`3`	`"version": "0.10.0",`
	`4`	`+ "port-version": 1,`
`4`	`5`	`"description": "PopSift is an implementation of the SIFT algorithm in CUDA.",`
`5`	`6`	`"homepage": "https://github.com/alicevision/popsift",`
`6`	`7`	`"documentation": "https://popsift.readthedocs.io/",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "24ec78a1eca98f407158ac08a43b923a5417849a",`
	`5`	`+ "version": "0.10.0",`
	`6`	`+ "port-version": 1`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "ee43b750c42a10ab97cd677af23edd402867a13a",`
`5`	`10`	`"version": "0.10.0",`