зеркало из https://github.com/microsoft/vcpkg.git
[pcl] update to version 1.13.0 (#28818)
* [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>
This commit is contained in:
Markus Vieth
GitHub
Родитель
91dd61bd44
Коммит
344b1d9608
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
||||
index 49e52b4..a9578bd 100644
|
||||
--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
||||
+++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
||||
@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const
|
||||
return m_active_id_count;
|
||||
}
|
||||
|
||||
+#pragma optimize("", off)
|
||||
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
|
||||
{
|
||||
struct SN_ELEMENT* e=0;
|
||||
@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
|
||||
}
|
||||
return e;
|
||||
}
|
||||
+#pragma optimize("", on)
|
||||
|
||||
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const
|
||||
{
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 17020e162..132fbcedb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -142,8 +142,9 @@ endif()
|
||||
if(CMAKE_COMPILER_IS_MSVC)
|
||||
add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}")
|
||||
|
||||
+ string(APPEND CMAKE_CXX_FLAGS " /bigobj")
|
||||
if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
|
||||
- string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS} /bigobj")
|
||||
+ string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS}")
|
||||
|
||||
# Add extra code generation/link optimizations
|
||||
if(CMAKE_MSVC_CODE_LINK_OPTIMIZATION AND (NOT BUILD_CUDA) AND (NOT BUILD_GPU))
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
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})
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
|
||||
index 6570d75..1d9b0d8 100644
|
||||
--- a/cmake/pcl_options.cmake
|
||||
+++ b/cmake/pcl_options.cmake
|
||||
@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS)
|
||||
set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
set(PCL_LIB_TYPE "SHARED")
|
||||
# set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
- if(WIN32)
|
||||
+ if(0)
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX})
|
||||
endif()
|
||||
else()
|
||||
set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
|
||||
set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
set(PCL_LIB_TYPE "STATIC")
|
||||
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
endif()
|
||||
mark_as_advanced(PCL_SHARED_LIBS)
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/common/src/fft/kiss_fft.c b/common/src/fft/kiss_fft.c
|
||||
index a996887..37232bd 100644
|
||||
--- a/common/src/fft/kiss_fft.c
|
||||
+++ b/common/src/fft/kiss_fft.c
|
||||
@@ -260,11 +260,13 @@ void kf_work(
|
||||
#if (defined _OPENMP && (_OPENMP <= 201307)) || (defined __GNUC__ && (__GNUC__ >= 6 && __GNUC__ < 9))
|
||||
#pragma omp parallel for \
|
||||
default(none) \
|
||||
- shared(f, factors, Fout, in_stride)
|
||||
+ shared(f, factors, Fout, in_stride) \
|
||||
+ private(k)
|
||||
#else
|
||||
#pragma omp parallel for \
|
||||
default(none) \
|
||||
- shared(f, factors, Fout, fstride, in_stride, m, p, st)
|
||||
+ shared(f, factors, Fout, fstride, in_stride, m, p, st) \
|
||||
+ private(k)
|
||||
#endif
|
||||
for (k=0;k<p;++k)
|
||||
kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
diff --git a/cmake/Modules/FindOpenNI.cmake b/cmake/Modules/FindOpenNI.cmake
|
||||
index 249e896..eff0b95 100644
|
||||
--- a/cmake/Modules/FindOpenNI.cmake
|
||||
+++ b/cmake/Modules/FindOpenNI.cmake
|
||||
@@ -51,9 +51,9 @@ if(OPENNI_INCLUDE_DIR AND OPENNI_LIBRARY)
|
||||
mark_as_advanced(OPENNI_INCLUDE_DIRS)
|
||||
|
||||
# Libraries
|
||||
- if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
- find_package(libusb REQUIRED)
|
||||
- set(OPENNI_LIBRARIES ${OPENNI_LIBRARY} libusb::libusb)
|
||||
+ if(NOT WIN32)
|
||||
+ find_package(libusb CONFIG REQUIRED)
|
||||
+ set(OPENNI_LIBRARIES ${OPENNI_LIBRARIES} ${LIBUSB_LIBRARIES})
|
||||
else()
|
||||
set(OPENNI_LIBRARIES ${OPENNI_LIBRARY})
|
||||
endif()
|
||||
diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
|
||||
index 14ca206..8471067 100644
|
||||
--- a/cmake/Modules/FindOpenNI2.cmake
|
||||
+++ b/cmake/Modules/FindOpenNI2.cmake
|
||||
@@ -41,9 +41,9 @@ if(OPENNI2_INCLUDE_DIR AND OPENNI2_LIBRARY)
|
||||
mark_as_advanced(OPENNI2_INCLUDE_DIRS)
|
||||
|
||||
# Libraries
|
||||
- if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
- find_package(libusb REQUIRED)
|
||||
- set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY} libusb::libusb)
|
||||
+ if(NOT WIN32)
|
||||
+ find_package(libusb CONFIG REQUIRED)
|
||||
+ set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY} ${LIBUSB_LIBRARIES})
|
||||
else()
|
||||
set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY})
|
||||
endif()
|
||||
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
|
||||
index ab91842..189063c 100644
|
||||
--- a/io/CMakeLists.txt
|
||||
+++ b/io/CMakeLists.txt
|
||||
@@ -334,7 +334,7 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}")
|
||||
|
||||
add_definitions(${VTK_DEFINES})
|
||||
|
||||
-PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
|
||||
+PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES} ${LIBUSB_INCLUDE_DIRS})
|
||||
|
||||
target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
|
||||
@@ -356,7 +356,7 @@ if(PNG_FOUND)
|
||||
endif()
|
||||
|
||||
if(LIBUSB_FOUND)
|
||||
- target_link_libraries("${LIB_NAME}" libusb::libusb)
|
||||
+ target_link_libraries("${LIB_NAME}" ${LIBUSB_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(WITH_OPENNI2)
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a1d9bb5..bf64c46 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -359,10 +359,8 @@ if(WITH_QHULL)
|
||||
if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32))
|
||||
set(QHULL_USE_STATIC ON)
|
||||
endif()
|
||||
- find_package(Qhull)
|
||||
- if(QHULL_FOUND)
|
||||
- include_directories(SYSTEM ${QHULL_INCLUDE_DIRS})
|
||||
- endif()
|
||||
+ find_package(QHULL NAMES Qhull CONFIG REQUIRED)
|
||||
+ set(HAVE_QHULL ON)
|
||||
endif()
|
||||
|
||||
# Cuda
|
||||
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
||||
index a1283a8..32f95b3 100644
|
||||
--- a/PCLConfig.cmake.in
|
||||
+++ b/PCLConfig.cmake.in
|
||||
@@ -26,6 +26,7 @@ endif()
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules")
|
||||
|
||||
+include(CMakeFindDependencyMacro)
|
||||
### ---[ some useful macros
|
||||
macro(pcl_report_not_found _reason)
|
||||
unset(PCL_FOUND)
|
||||
@@ -136,7 +137,7 @@ macro(find_qhull)
|
||||
endif()
|
||||
|
||||
set(QHULL_USE_STATIC @QHULL_USE_STATIC@)
|
||||
- find_package(Qhull)
|
||||
+ find_dependency(QHULL NAMES Qhull CONFIG)
|
||||
endmacro()
|
||||
|
||||
#remove this as soon as libopenni is shipped with FindOpenni.cmake
|
||||
diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
|
||||
index d8a8566..a629b2a 100644
|
||||
--- a/surface/CMakeLists.txt
|
||||
+++ b/surface/CMakeLists.txt
|
||||
@@ -187,6 +187,11 @@ if(VTK_FOUND)
|
||||
endif()
|
||||
|
||||
if(QHULL_FOUND)
|
||||
+ if(QHULL_USE_STATIC)
|
||||
+ set(QHULL_LIBRARIES Qhull::qhullcpp Qhull::qhullstatic Qhull::qhullstatic_r)
|
||||
+ else()
|
||||
+ set(QHULL_LIBRARIES Qhull::qhull_r Qhull::qhullcpp)
|
||||
+ endif()
|
||||
target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES})
|
||||
endif()
|
||||
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
diff --git a/gpu/features/src/centroid.cu b/gpu/features/src/centroid.cu
|
||||
index 045fe6f..3e9ef8b 100644
|
||||
--- a/gpu/features/src/centroid.cu
|
||||
+++ b/gpu/features/src/centroid.cu
|
||||
@@ -44,7 +44,6 @@
|
||||
|
||||
#include "pcl/gpu/utils/device/vector_math.hpp"
|
||||
|
||||
-using namespace thrust;
|
||||
|
||||
namespace pcl
|
||||
{
|
||||
@@ -124,9 +123,10 @@ float3 pcl::device::getMaxDistance(const DeviceArray<PointT>& cloud, const float
|
||||
thrust::counting_iterator<int> ce = cf + cloud.size();
|
||||
|
||||
thrust::tuple<float, int> init(0.f, 0);
|
||||
- thrust::maximum< tuple<float, int> > op;
|
||||
+ thrust::maximum<thrust::tuple<float, int>> op;
|
||||
|
||||
- tuple<float, int> res = transform_reduce(
|
||||
+ thrust::tuple<float, int> res =
|
||||
+ transform_reduce(
|
||||
make_zip_iterator(make_tuple( src_beg, cf )),
|
||||
make_zip_iterator(make_tuple( src_beg, ce )),
|
||||
TupleDistCvt(pivot), init, op);
|
||||
@@ -151,9 +151,9 @@ float3 pcl::device::getMaxDistance(const DeviceArray<PointT>& cloud, const Indic
|
||||
thrust::counting_iterator<int> ce = cf + indices.size();
|
||||
|
||||
thrust::tuple<float, int> init(0.f, 0);
|
||||
- thrust::maximum< tuple<float, int> > op;
|
||||
+ thrust::maximum<thrust::tuple<float, int>> op;
|
||||
|
||||
- tuple<float, int> res = transform_reduce(
|
||||
+ thrust::tuple<float, int> res = transform_reduce(
|
||||
make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_beg), cf )),
|
||||
make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_end), ce )),
|
||||
TupleDistCvt(pivot), init, op);
|
||||
diff --git a/gpu/octree/src/cuda/bfrs.cu b/gpu/octree/src/cuda/bfrs.cu
|
||||
index d392f67..0635e1e 100644
|
||||
--- a/gpu/octree/src/cuda/bfrs.cu
|
||||
+++ b/gpu/octree/src/cuda/bfrs.cu
|
||||
@@ -43,7 +43,6 @@
|
||||
|
||||
#include "cuda.h"
|
||||
|
||||
-using namespace thrust;
|
||||
|
||||
namespace pcl
|
||||
{
|
||||
@@ -80,11 +79,11 @@ void pcl::device::bruteForceRadiusSearch(const OctreeImpl::PointCloud& cloud, co
|
||||
|
||||
InSphere cond(query.x, query.y, query.z, radius);
|
||||
|
||||
- device_ptr<const PointType> cloud_ptr((const PointType*)cloud.ptr());
|
||||
- device_ptr<int> res_ptr(buffer.ptr());
|
||||
+ thrust::device_ptr<const PointType> cloud_ptr((const PointType*)cloud.ptr());
|
||||
+ thrust::device_ptr<int> res_ptr(buffer.ptr());
|
||||
|
||||
- counting_iterator<int> first(0);
|
||||
- counting_iterator<int> last = first + cloud.size();
|
||||
+ thrust::counting_iterator<int> first(0);
|
||||
+ thrust::counting_iterator<int> last = first + cloud.size();
|
||||
|
||||
//main bottle neck is a kernel call overhead/allocs
|
||||
//work time for 871k points ~0.8ms
|
||||
diff --git a/gpu/octree/src/cuda/octree_builder.cu b/gpu/octree/src/cuda/octree_builder.cu
|
||||
index dfd2093..faad764 100644
|
||||
--- a/gpu/octree/src/cuda/octree_builder.cu
|
||||
+++ b/gpu/octree/src/cuda/octree_builder.cu
|
||||
@@ -51,7 +51,6 @@
|
||||
#include <thrust/device_ptr.h>
|
||||
|
||||
using namespace pcl::gpu;
|
||||
-using namespace thrust;
|
||||
|
||||
namespace pcl
|
||||
{
|
||||
@@ -316,7 +315,7 @@ void pcl::device::OctreeImpl::build()
|
||||
// 3 * sizeof(int) => +1 row
|
||||
|
||||
const int transaction_size = 128 / sizeof(int);
|
||||
- int cols = max<int>(points_num, transaction_size * 4);
|
||||
+ int cols = std::max<int>(points_num, transaction_size * 4);
|
||||
int rows = 10 + 1; // = 13
|
||||
|
||||
storage.create(rows, cols);
|
||||
@@ -338,8 +337,8 @@ void pcl::device::OctreeImpl::build()
|
||||
{
|
||||
//ScopeTimer timer("reduce-morton-sort-permutations");
|
||||
|
||||
- device_ptr<PointType> beg(points.ptr());
|
||||
- device_ptr<PointType> end = beg + points.size();
|
||||
+ thrust::device_ptr<PointType> beg(points.ptr());
|
||||
+ thrust::device_ptr<PointType> end = beg + points.size();
|
||||
|
||||
{
|
||||
PointType atmax, atmin;
|
||||
@@ -355,15 +354,15 @@ void pcl::device::OctreeImpl::build()
|
||||
octreeGlobal.maxp = make_float3(maxp.x, maxp.y, maxp.z);
|
||||
}
|
||||
|
||||
- device_ptr<int> codes_beg(codes.ptr());
|
||||
- device_ptr<int> codes_end = codes_beg + codes.size();
|
||||
+ thrust::device_ptr<int> codes_beg(codes.ptr());
|
||||
+ thrust::device_ptr<int> codes_end = codes_beg + codes.size();
|
||||
{
|
||||
//ScopeTimer timer("morton");
|
||||
thrust::transform(beg, end, codes_beg, CalcMorton(octreeGlobal.minp, octreeGlobal.maxp));
|
||||
}
|
||||
|
||||
- device_ptr<int> indices_beg(indices.ptr());
|
||||
- device_ptr<int> indices_end = indices_beg + indices.size();
|
||||
+ thrust::device_ptr<int> indices_beg(indices.ptr());
|
||||
+ thrust::device_ptr<int> indices_end = indices_beg + indices.size();
|
||||
{
|
||||
//ScopeTimer timer("sort");
|
||||
thrust::sequence(indices_beg, indices_end);
|
||||
@@ -378,9 +377,9 @@ void pcl::device::OctreeImpl::build()
|
||||
}
|
||||
|
||||
{
|
||||
- device_ptr<float> xs(points_sorted.ptr(0));
|
||||
- device_ptr<float> ys(points_sorted.ptr(1));
|
||||
- device_ptr<float> zs(points_sorted.ptr(2));
|
||||
+ thrust::device_ptr<float> xs(points_sorted.ptr(0));
|
||||
+ thrust::device_ptr<float> ys(points_sorted.ptr(1));
|
||||
+ thrust::device_ptr<float> zs(points_sorted.ptr(2));
|
||||
//ScopeTimer timer("perm2");
|
||||
thrust::transform(make_permutation_iterator(beg, indices_beg),
|
||||
make_permutation_iterator(end, indices_end),
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff --git a/cuda/common/CMakeLists.txt b/cuda/common/CMakeLists.txt
|
||||
index b5775af..e7a2ff2 100644
|
||||
--- a/cuda/common/CMakeLists.txt
|
||||
+++ b/cuda/common/CMakeLists.txt
|
||||
@@ -29,10 +29,10 @@ set(common_incs
|
||||
)
|
||||
|
||||
include_directories(./include)
|
||||
-#set(LIB_NAME pcl_${SUBSYS_NAME})
|
||||
+set(LIB_NAME "pcl_${SUBSYS_NAME}")
|
||||
set(EXT_DEPS CUDA)
|
||||
-#PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
|
||||
-# "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
|
||||
+PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC "${SUBSYS_DESC}"
|
||||
+ PCL_DEPS "${SUBSYS_DEPS}" EXT_DEPS "" HEADER_ONLY)
|
||||
|
||||
# Install include files
|
||||
PCL_ADD_INCLUDES(${SUBSYS_NAME} "cuda" ${incs})
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||||
index 384e7bac8..cde079401 100644
|
||||
--- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||||
+++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h
|
||||
@@ -137,15 +137,15 @@
|
||||
#if defined(_M_X64) && defined(WIN32) && defined(WIN64)
|
||||
// 23 August 2007 Dale Lear
|
||||
|
||||
-#if defined(_INC_WINDOWS)
|
||||
+//#if defined(_INC_WINDOWS)
|
||||
// The user has included Microsoft's windows.h before opennurbs.h,
|
||||
// and windows.h has nested includes that unconditionally define WIN32.
|
||||
// Just undo the damage here or everybody that includes opennurbs.h after
|
||||
// windows.h has to fight with this Microsoft bug.
|
||||
#undef WIN32
|
||||
-#else
|
||||
-#error do not define WIN32 for x64 builds
|
||||
-#endif
|
||||
+//#else
|
||||
+//#error do not define WIN32 for x64 builds
|
||||
+//#endif
|
||||
|
||||
// NOTE _WIN32 is defined for any type of Windows build
|
||||
#endif
|
||||
|
|
@ -2,7 +2,7 @@ diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
|||
index 4137ed1..167fde2 100644
|
||||
--- a/PCLConfig.cmake.in
|
||||
+++ b/PCLConfig.cmake.in
|
||||
@@ -230,7 +230,7 @@ macro(find_flann)
|
||||
@@ -225,7 +225,7 @@ macro(find_flann)
|
||||
if(PCL_ALL_IN_ONE_INSTALLER)
|
||||
set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann")
|
||||
elseif(NOT FLANN_ROOT)
|
||||
|
|
@ -10,12 +10,4 @@ index 4137ed1..167fde2 100644
|
|||
+ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}")
|
||||
endif()
|
||||
|
||||
set(FLANN_USE_STATIC @FLANN_USE_STATIC@)
|
||||
@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
|
||||
# pcl_message("PCL found into a build tree.")
|
||||
set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h
|
||||
set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
|
||||
- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
|
||||
else()
|
||||
pcl_report_not_found("PCL can not be found on this machine")
|
||||
endif()
|
||||
set(PCL_FLANN_REQUIRED_TYPE @PCL_FLANN_REQUIRED_TYPE@)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/outofcore/tools/outofcore_viewer.cpp b/outofcore/tools/outofcore_viewer.cpp
|
||||
index 6ec57e09359..795e03d7598 100644
|
||||
--- a/outofcore/tools/outofcore_viewer.cpp
|
||||
+++ b/outofcore/tools/outofcore_viewer.cpp
|
||||
@@ -112,7 +112,6 @@ using AlignedPointT = Eigen::aligned_allocator<PointT>;
|
||||
#include <vtkLODActor.h>
|
||||
#include <vtkMath.h>
|
||||
#include <vtkMatrix4x4.h>
|
||||
-#include <vtkMutexLock.h>
|
||||
#include <vtkObjectFactory.h>
|
||||
#include <vtkPolyData.h>
|
||||
#include <vtkProperty.h>
|
||||
|
|
@ -1,30 +1,23 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO PointCloudLibrary/pcl
|
||||
REF f36a69a5e89953708990c4669317f989d532cf08 # pcl-1.12.0
|
||||
SHA512 dbbd0adbb08949ddef2789e0021b6ca9727be33c7193d0bb135c61def09a42ed6a71333f06b6fad407010ecb4b73c19f087f7520386b92a008e90c254eafe422
|
||||
REF 371a8e1373f7b2f66bbb92291be2f3e50dc19856 # pcl-1.13.0
|
||||
SHA512 5c023e46386882d51a5d9a3c8ac594c17585e3d14c011964109ad0ae432c660ebb7fc1fe56f1130b6eafa75d1d9ca48f05e22e1d7cbb4a0794e32982da168563
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
add-gcc-version-check.patch
|
||||
fix-check-sse.patch
|
||||
fix-find-qhull.patch
|
||||
fix-numeric-literals-flag.patch
|
||||
pcl_config.patch
|
||||
pcl_utils.patch
|
||||
remove-broken-targets.patch
|
||||
fix-cmake_find_library_suffixes.patch
|
||||
fix-pkgconfig.patch # Remove this patch in the next update
|
||||
fix-namespace-cub.patch # Remove this patch in the next update
|
||||
fix-error-C3052.patch # Remove this patch in the next update
|
||||
fix-find-libusb.patch
|
||||
install-examples.patch
|
||||
no-absolute.patch
|
||||
Workaround-ICE-in-release.patch
|
||||
add_bigobj_option.patch
|
||||
outofcore_viewer_remove_include.patch
|
||||
fix_opennurbs_win32.patch
|
||||
disable_kinfu_for_cuda12.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake"
|
||||
"${SOURCE_PATH}/cmake/Modules/Findlibusb.cmake"
|
||||
)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
|
||||
|
||||
if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
|
||||
|
|
@ -66,6 +59,7 @@ vcpkg_cmake_configure(
|
|||
-DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
|
||||
-DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
|
||||
-DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
|
||||
-DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON
|
||||
# WITH
|
||||
-DWITH_PNG=ON
|
||||
-DWITH_QHULL=ON
|
||||
|
|
@ -80,6 +74,7 @@ vcpkg_cmake_configure(
|
|||
${FEATURE_OPTIONS}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32
|
||||
PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 1b2613e1df507fd868b4971294f9a28183ce2e6c Mon Sep 17 00:00:00 2001
|
||||
From: raahilsha-z <raahil.sha@zimaging.io>
|
||||
Date: Wed, 7 Jul 2021 16:01:03 -0400
|
||||
Subject: [PATCH] remove broken targets
|
||||
|
||||
---
|
||||
tools/CMakeLists.txt | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
||||
index 5bfe6e94c..7abf3d746 100644
|
||||
--- a/tools/CMakeLists.txt
|
||||
+++ b/tools/CMakeLists.txt
|
||||
@@ -123,15 +123,6 @@ target_link_libraries(pcl_concatenate_points_pcd pcl_common pcl_io)
|
||||
PCL_ADD_EXECUTABLE(pcl_poisson_reconstruction COMPONENT ${SUBSYS_NAME} SOURCES poisson_reconstruction.cpp)
|
||||
target_link_libraries(pcl_poisson_reconstruction pcl_common pcl_io pcl_surface)
|
||||
|
||||
-PCL_ADD_EXECUTABLE(pcl_train_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES train_linemod_template.cpp)
|
||||
-target_link_libraries(pcl_train_linemod_template pcl_common pcl_io pcl_segmentation pcl_recognition)
|
||||
-
|
||||
-PCL_ADD_EXECUTABLE(pcl_match_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES match_linemod_template.cpp)
|
||||
-target_link_libraries(pcl_match_linemod_template pcl_common pcl_io pcl_recognition)
|
||||
-
|
||||
-PCL_ADD_EXECUTABLE(pcl_linemod_detection COMPONENT ${SUBSYS_NAME} SOURCES linemod_detection.cpp)
|
||||
-target_link_libraries(pcl_linemod_detection pcl_common pcl_io pcl_recognition)
|
||||
-
|
||||
PCL_ADD_EXECUTABLE(pcl_fast_bilateral_filter COMPONENT ${SUBSYS_NAME} SOURCES fast_bilateral_filter.cpp)
|
||||
target_link_libraries(pcl_fast_bilateral_filter pcl_common pcl_io pcl_filters)
|
||||
|
||||
--
|
||||
2.32.0.windows.1
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "pcl",
|
||||
"version": "1.12.0",
|
||||
"port-version": 7,
|
||||
"version": "1.13.0",
|
||||
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
|
||||
"homepage": "https://github.com/PointCloudLibrary/pcl",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
@ -134,7 +133,12 @@
|
|||
"visualization": {
|
||||
"description": "Build visualization",
|
||||
"dependencies": [
|
||||
"vtk"
|
||||
{
|
||||
"name": "vtk",
|
||||
"features": [
|
||||
"opengl"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"vtk": {
|
||||
|
|
|
|||
|
|
@ -5825,8 +5825,8 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"pcl": {
|
||||
"baseline": "1.12.0",
|
||||
"port-version": 7
|
||||
"baseline": "1.13.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"pcre": {
|
||||
"baseline": "8.45",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f295f2d1ea57514c89835cd797fa8cca1d0b5fdf",
|
||||
"version": "1.13.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "aec81fe0832359b4fea5929da4e34af33f116baa",
|
||||
"version": "1.12.0",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче