mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 12:29:08 +08:00
344b1d9608
* [pcl] update to version 1.13.0 * More necessary changes * Make requested changes * Remove qhull patch * Remove another patch * Remove libusb patch * Fix no-absolute.patch * Fix patch * Correct versions * Allow static and shared deps * Add patch for bigobj option * Don't remove files * Request opengl feature of vtk * Add patch to remove problematic include * Add patch to remove error in opennurbs code * Add patch to disable kinfu for cuda 12 --------- Co-authored-by: Jonliu1993 <13720414433@163.com>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
diff --git a/gpu/kinfu/CMakeLists.txt b/gpu/kinfu/CMakeLists.txt
|
|
index 29cb73e95..fbbd294fd 100644
|
|
--- a/gpu/kinfu/CMakeLists.txt
|
|
+++ b/gpu/kinfu/CMakeLists.txt
|
|
@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu)
|
|
set(SUBSYS_PATH gpu/kinfu)
|
|
set(SUBSYS_DESC "Kinect Fusion implementation")
|
|
set(SUBSYS_DEPS common io gpu_containers geometry search)
|
|
-set(DEFAULT TRUE)
|
|
+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0")
|
|
+ set(DEFAULT FALSE)
|
|
+ set(REASON "Kinfu uses textures which was removed in CUDA 12")
|
|
+else()
|
|
+ set(DEFAULT TRUE)
|
|
+endif()
|
|
|
|
PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
|
|
PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
|
|
diff --git a/gpu/kinfu_large_scale/CMakeLists.txt b/gpu/kinfu_large_scale/CMakeLists.txt
|
|
index d7efc4ad5..0488fcb46 100644
|
|
--- a/gpu/kinfu_large_scale/CMakeLists.txt
|
|
+++ b/gpu/kinfu_large_scale/CMakeLists.txt
|
|
@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu_large_scale)
|
|
set(SUBSYS_PATH gpu/kinfu_large_scale)
|
|
set(SUBSYS_DESC "Kinect Fusion implementation, with volume shifting")
|
|
set(SUBSYS_DEPS common io gpu_containers gpu_utils geometry search octree filters kdtree features surface)
|
|
-set(DEFAULT TRUE)
|
|
+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0")
|
|
+ set(DEFAULT FALSE)
|
|
+ set(REASON "Kinfu_large_scale uses textures which was removed in CUDA 12")
|
|
+else()
|
|
+ set(DEFAULT TRUE)
|
|
+endif()
|
|
|
|
PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
|
|
PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS})
|