Spaces:
Sleeping
Sleeping
aa684944cf2bfdc9b83ac317a8651bbfe9e136703fd997f83535e986fecb691e
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/Workaround-ICE-in-release.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-cmake_find_library_suffixes.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-error-C3052.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-find-libusb.patch +56 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-find-qhull.patch +44 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-namespace-cub.patch +130 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-numeric-literals-flag.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-pkgconfig.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/install-examples.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/no-absolute.patch +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/pcl_config.patch +43 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/pcl_utils.patch +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/portfile.cmake +127 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/remove-broken-targets.patch +32 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/vcpkg.json +153 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/export-cmake-targets.patch +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch +161 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/portfile.cmake +73 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/unofficial-pcre-config.cmake +1 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/pcre2-10.35_fix-uwp.patch +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/portfile.cmake +64 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/cmake-project-include.cmake +3 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/portfile.cmake +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/0002-no-source-dir-writes.patch +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/0003-fix-copy-vendor.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-dependency.patch +34 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-find-library-suffix.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-unix-compiler-options.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/no-pkgconfig-requires.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/no-rpath.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/portfile.cmake +86 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/usage +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/use-vcpkg-boost.patch +66 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/vcpkg.json +109 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/LICENSE +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/nmake-install.patch +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/portfile.cmake +42 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdqsort/portfile.cmake +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdqsort/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/arm64-windows-fix.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/portfile.cmake +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pegtl/portfile.cmake +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pegtl/vcpkg.json +17 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/Workaround-ICE-in-release.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
2 |
+
index 49e52b4..a9578bd 100644
|
3 |
+
--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
4 |
+
+++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp
|
5 |
+
@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const
|
6 |
+
return m_active_id_count;
|
7 |
+
}
|
8 |
+
|
9 |
+
+#pragma optimize("", off)
|
10 |
+
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
|
11 |
+
{
|
12 |
+
struct SN_ELEMENT* e=0;
|
13 |
+
@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const
|
14 |
+
}
|
15 |
+
return e;
|
16 |
+
}
|
17 |
+
+#pragma optimize("", on)
|
18 |
+
|
19 |
+
struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const
|
20 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-cmake_find_library_suffixes.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
|
2 |
+
index 6570d75..1d9b0d8 100644
|
3 |
+
--- a/cmake/pcl_options.cmake
|
4 |
+
+++ b/cmake/pcl_options.cmake
|
5 |
+
@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS)
|
6 |
+
set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
7 |
+
set(PCL_LIB_TYPE "SHARED")
|
8 |
+
# set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
9 |
+
- if(WIN32)
|
10 |
+
+ if(0)
|
11 |
+
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX})
|
12 |
+
endif()
|
13 |
+
else()
|
14 |
+
set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
|
15 |
+
set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
16 |
+
set(PCL_LIB_TYPE "STATIC")
|
17 |
+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
18 |
+
endif()
|
19 |
+
mark_as_advanced(PCL_SHARED_LIBS)
|
20 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-error-C3052.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/common/src/fft/kiss_fft.c b/common/src/fft/kiss_fft.c
|
2 |
+
index a996887..37232bd 100644
|
3 |
+
--- a/common/src/fft/kiss_fft.c
|
4 |
+
+++ b/common/src/fft/kiss_fft.c
|
5 |
+
@@ -260,11 +260,13 @@ void kf_work(
|
6 |
+
#if (defined _OPENMP && (_OPENMP <= 201307)) || (defined __GNUC__ && (__GNUC__ >= 6 && __GNUC__ < 9))
|
7 |
+
#pragma omp parallel for \
|
8 |
+
default(none) \
|
9 |
+
- shared(f, factors, Fout, in_stride)
|
10 |
+
+ shared(f, factors, Fout, in_stride) \
|
11 |
+
+ private(k)
|
12 |
+
#else
|
13 |
+
#pragma omp parallel for \
|
14 |
+
default(none) \
|
15 |
+
- shared(f, factors, Fout, fstride, in_stride, m, p, st)
|
16 |
+
+ shared(f, factors, Fout, fstride, in_stride, m, p, st) \
|
17 |
+
+ private(k)
|
18 |
+
#endif
|
19 |
+
for (k=0;k<p;++k)
|
20 |
+
kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-find-libusb.patch
ADDED
@@ -0,0 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/Modules/FindOpenNI.cmake b/cmake/Modules/FindOpenNI.cmake
|
2 |
+
index 249e896..eff0b95 100644
|
3 |
+
--- a/cmake/Modules/FindOpenNI.cmake
|
4 |
+
+++ b/cmake/Modules/FindOpenNI.cmake
|
5 |
+
@@ -51,9 +51,9 @@ if(OPENNI_INCLUDE_DIR AND OPENNI_LIBRARY)
|
6 |
+
mark_as_advanced(OPENNI_INCLUDE_DIRS)
|
7 |
+
|
8 |
+
# Libraries
|
9 |
+
- if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
10 |
+
- find_package(libusb REQUIRED)
|
11 |
+
- set(OPENNI_LIBRARIES ${OPENNI_LIBRARY} libusb::libusb)
|
12 |
+
+ if(NOT WIN32)
|
13 |
+
+ find_package(libusb CONFIG REQUIRED)
|
14 |
+
+ set(OPENNI_LIBRARIES ${OPENNI_LIBRARIES} ${LIBUSB_LIBRARIES})
|
15 |
+
else()
|
16 |
+
set(OPENNI_LIBRARIES ${OPENNI_LIBRARY})
|
17 |
+
endif()
|
18 |
+
diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
|
19 |
+
index 14ca206..8471067 100644
|
20 |
+
--- a/cmake/Modules/FindOpenNI2.cmake
|
21 |
+
+++ b/cmake/Modules/FindOpenNI2.cmake
|
22 |
+
@@ -41,9 +41,9 @@ if(OPENNI2_INCLUDE_DIR AND OPENNI2_LIBRARY)
|
23 |
+
mark_as_advanced(OPENNI2_INCLUDE_DIRS)
|
24 |
+
|
25 |
+
# Libraries
|
26 |
+
- if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
27 |
+
- find_package(libusb REQUIRED)
|
28 |
+
- set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY} libusb::libusb)
|
29 |
+
+ if(NOT WIN32)
|
30 |
+
+ find_package(libusb CONFIG REQUIRED)
|
31 |
+
+ set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY} ${LIBUSB_LIBRARIES})
|
32 |
+
else()
|
33 |
+
set(OPENNI2_LIBRARIES ${OPENNI2_LIBRARY})
|
34 |
+
endif()
|
35 |
+
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
|
36 |
+
index ab91842..189063c 100644
|
37 |
+
--- a/io/CMakeLists.txt
|
38 |
+
+++ b/io/CMakeLists.txt
|
39 |
+
@@ -334,7 +334,7 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}")
|
40 |
+
|
41 |
+
add_definitions(${VTK_DEFINES})
|
42 |
+
|
43 |
+
-PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES})
|
44 |
+
+PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES} ${LIBUSB_INCLUDE_DIRS})
|
45 |
+
|
46 |
+
target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
47 |
+
|
48 |
+
@@ -356,7 +356,7 @@ if(PNG_FOUND)
|
49 |
+
endif()
|
50 |
+
|
51 |
+
if(LIBUSB_FOUND)
|
52 |
+
- target_link_libraries("${LIB_NAME}" libusb::libusb)
|
53 |
+
+ target_link_libraries("${LIB_NAME}" ${LIBUSB_LIBRARIES})
|
54 |
+
endif()
|
55 |
+
|
56 |
+
if(WITH_OPENNI2)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-find-qhull.patch
ADDED
@@ -0,0 +1,44 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index a1d9bb5..73b1465 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -359,10 +359,8 @@ if(WITH_QHULL)
|
6 |
+
if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32))
|
7 |
+
set(QHULL_USE_STATIC ON)
|
8 |
+
endif()
|
9 |
+
- find_package(Qhull)
|
10 |
+
- if(QHULL_FOUND)
|
11 |
+
- include_directories(SYSTEM ${QHULL_INCLUDE_DIRS})
|
12 |
+
- endif()
|
13 |
+
+ find_package(Qhull CONFIG REQUIRED)
|
14 |
+
+ set(HAVE_QHULL ON)
|
15 |
+
endif()
|
16 |
+
|
17 |
+
# Cuda
|
18 |
+
diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
|
19 |
+
index d8a8566..1953c55 100644
|
20 |
+
--- a/surface/CMakeLists.txt
|
21 |
+
+++ b/surface/CMakeLists.txt
|
22 |
+
@@ -12,7 +12,7 @@ if(NOT build)
|
23 |
+
return()
|
24 |
+
endif()
|
25 |
+
|
26 |
+
-if(QHULL_FOUND)
|
27 |
+
+if(Qhull_FOUND)
|
28 |
+
set(HULL_INCLUDES
|
29 |
+
"include/pcl/${SUBSYS_NAME}/concave_hull.h"
|
30 |
+
"include/pcl/${SUBSYS_NAME}/convex_hull.h"
|
31 |
+
@@ -186,7 +186,12 @@ if(VTK_FOUND)
|
32 |
+
endif()
|
33 |
+
endif()
|
34 |
+
|
35 |
+
-if(QHULL_FOUND)
|
36 |
+
+if(Qhull_FOUND)
|
37 |
+
+ if(QHULL_USE_STATIC)
|
38 |
+
+ set(QHULL_LIBRARIES Qhull::qhullcpp Qhull::qhullstatic Qhull::qhullstatic_r)
|
39 |
+
+ else()
|
40 |
+
+ set(QHULL_LIBRARIES Qhull::qhull_r Qhull::qhullcpp)
|
41 |
+
+ endif()
|
42 |
+
target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES})
|
43 |
+
endif()
|
44 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-namespace-cub.patch
ADDED
@@ -0,0 +1,130 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/gpu/features/src/centroid.cu b/gpu/features/src/centroid.cu
|
2 |
+
index 045fe6f..3e9ef8b 100644
|
3 |
+
--- a/gpu/features/src/centroid.cu
|
4 |
+
+++ b/gpu/features/src/centroid.cu
|
5 |
+
@@ -44,7 +44,6 @@
|
6 |
+
|
7 |
+
#include "pcl/gpu/utils/device/vector_math.hpp"
|
8 |
+
|
9 |
+
-using namespace thrust;
|
10 |
+
|
11 |
+
namespace pcl
|
12 |
+
{
|
13 |
+
@@ -124,9 +123,10 @@ float3 pcl::device::getMaxDistance(const DeviceArray<PointT>& cloud, const float
|
14 |
+
thrust::counting_iterator<int> ce = cf + cloud.size();
|
15 |
+
|
16 |
+
thrust::tuple<float, int> init(0.f, 0);
|
17 |
+
- thrust::maximum< tuple<float, int> > op;
|
18 |
+
+ thrust::maximum<thrust::tuple<float, int>> op;
|
19 |
+
|
20 |
+
- tuple<float, int> res = transform_reduce(
|
21 |
+
+ thrust::tuple<float, int> res =
|
22 |
+
+ transform_reduce(
|
23 |
+
make_zip_iterator(make_tuple( src_beg, cf )),
|
24 |
+
make_zip_iterator(make_tuple( src_beg, ce )),
|
25 |
+
TupleDistCvt(pivot), init, op);
|
26 |
+
@@ -151,9 +151,9 @@ float3 pcl::device::getMaxDistance(const DeviceArray<PointT>& cloud, const Indic
|
27 |
+
thrust::counting_iterator<int> ce = cf + indices.size();
|
28 |
+
|
29 |
+
thrust::tuple<float, int> init(0.f, 0);
|
30 |
+
- thrust::maximum< tuple<float, int> > op;
|
31 |
+
+ thrust::maximum<thrust::tuple<float, int>> op;
|
32 |
+
|
33 |
+
- tuple<float, int> res = transform_reduce(
|
34 |
+
+ thrust::tuple<float, int> res = transform_reduce(
|
35 |
+
make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_beg), cf )),
|
36 |
+
make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_end), ce )),
|
37 |
+
TupleDistCvt(pivot), init, op);
|
38 |
+
diff --git a/gpu/octree/src/cuda/bfrs.cu b/gpu/octree/src/cuda/bfrs.cu
|
39 |
+
index d392f67..0635e1e 100644
|
40 |
+
--- a/gpu/octree/src/cuda/bfrs.cu
|
41 |
+
+++ b/gpu/octree/src/cuda/bfrs.cu
|
42 |
+
@@ -43,7 +43,6 @@
|
43 |
+
|
44 |
+
#include "cuda.h"
|
45 |
+
|
46 |
+
-using namespace thrust;
|
47 |
+
|
48 |
+
namespace pcl
|
49 |
+
{
|
50 |
+
@@ -80,11 +79,11 @@ void pcl::device::bruteForceRadiusSearch(const OctreeImpl::PointCloud& cloud, co
|
51 |
+
|
52 |
+
InSphere cond(query.x, query.y, query.z, radius);
|
53 |
+
|
54 |
+
- device_ptr<const PointType> cloud_ptr((const PointType*)cloud.ptr());
|
55 |
+
- device_ptr<int> res_ptr(buffer.ptr());
|
56 |
+
+ thrust::device_ptr<const PointType> cloud_ptr((const PointType*)cloud.ptr());
|
57 |
+
+ thrust::device_ptr<int> res_ptr(buffer.ptr());
|
58 |
+
|
59 |
+
- counting_iterator<int> first(0);
|
60 |
+
- counting_iterator<int> last = first + cloud.size();
|
61 |
+
+ thrust::counting_iterator<int> first(0);
|
62 |
+
+ thrust::counting_iterator<int> last = first + cloud.size();
|
63 |
+
|
64 |
+
//main bottle neck is a kernel call overhead/allocs
|
65 |
+
//work time for 871k points ~0.8ms
|
66 |
+
diff --git a/gpu/octree/src/cuda/octree_builder.cu b/gpu/octree/src/cuda/octree_builder.cu
|
67 |
+
index dfd2093..faad764 100644
|
68 |
+
--- a/gpu/octree/src/cuda/octree_builder.cu
|
69 |
+
+++ b/gpu/octree/src/cuda/octree_builder.cu
|
70 |
+
@@ -51,7 +51,6 @@
|
71 |
+
#include <thrust/device_ptr.h>
|
72 |
+
|
73 |
+
using namespace pcl::gpu;
|
74 |
+
-using namespace thrust;
|
75 |
+
|
76 |
+
namespace pcl
|
77 |
+
{
|
78 |
+
@@ -316,7 +315,7 @@ void pcl::device::OctreeImpl::build()
|
79 |
+
// 3 * sizeof(int) => +1 row
|
80 |
+
|
81 |
+
const int transaction_size = 128 / sizeof(int);
|
82 |
+
- int cols = max<int>(points_num, transaction_size * 4);
|
83 |
+
+ int cols = std::max<int>(points_num, transaction_size * 4);
|
84 |
+
int rows = 10 + 1; // = 13
|
85 |
+
|
86 |
+
storage.create(rows, cols);
|
87 |
+
@@ -338,8 +337,8 @@ void pcl::device::OctreeImpl::build()
|
88 |
+
{
|
89 |
+
//ScopeTimer timer("reduce-morton-sort-permutations");
|
90 |
+
|
91 |
+
- device_ptr<PointType> beg(points.ptr());
|
92 |
+
- device_ptr<PointType> end = beg + points.size();
|
93 |
+
+ thrust::device_ptr<PointType> beg(points.ptr());
|
94 |
+
+ thrust::device_ptr<PointType> end = beg + points.size();
|
95 |
+
|
96 |
+
{
|
97 |
+
PointType atmax, atmin;
|
98 |
+
@@ -355,15 +354,15 @@ void pcl::device::OctreeImpl::build()
|
99 |
+
octreeGlobal.maxp = make_float3(maxp.x, maxp.y, maxp.z);
|
100 |
+
}
|
101 |
+
|
102 |
+
- device_ptr<int> codes_beg(codes.ptr());
|
103 |
+
- device_ptr<int> codes_end = codes_beg + codes.size();
|
104 |
+
+ thrust::device_ptr<int> codes_beg(codes.ptr());
|
105 |
+
+ thrust::device_ptr<int> codes_end = codes_beg + codes.size();
|
106 |
+
{
|
107 |
+
//ScopeTimer timer("morton");
|
108 |
+
thrust::transform(beg, end, codes_beg, CalcMorton(octreeGlobal.minp, octreeGlobal.maxp));
|
109 |
+
}
|
110 |
+
|
111 |
+
- device_ptr<int> indices_beg(indices.ptr());
|
112 |
+
- device_ptr<int> indices_end = indices_beg + indices.size();
|
113 |
+
+ thrust::device_ptr<int> indices_beg(indices.ptr());
|
114 |
+
+ thrust::device_ptr<int> indices_end = indices_beg + indices.size();
|
115 |
+
{
|
116 |
+
//ScopeTimer timer("sort");
|
117 |
+
thrust::sequence(indices_beg, indices_end);
|
118 |
+
@@ -378,9 +377,9 @@ void pcl::device::OctreeImpl::build()
|
119 |
+
}
|
120 |
+
|
121 |
+
{
|
122 |
+
- device_ptr<float> xs(points_sorted.ptr(0));
|
123 |
+
- device_ptr<float> ys(points_sorted.ptr(1));
|
124 |
+
- device_ptr<float> zs(points_sorted.ptr(2));
|
125 |
+
+ thrust::device_ptr<float> xs(points_sorted.ptr(0));
|
126 |
+
+ thrust::device_ptr<float> ys(points_sorted.ptr(1));
|
127 |
+
+ thrust::device_ptr<float> zs(points_sorted.ptr(2));
|
128 |
+
//ScopeTimer timer("perm2");
|
129 |
+
thrust::transform(make_permutation_iterator(beg, indices_beg),
|
130 |
+
make_permutation_iterator(end, indices_end),
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-numeric-literals-flag.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 3ea8aa5ded2782cfb10577348fc9f56144c72d7b Mon Sep 17 00:00:00 2001
|
2 |
+
From: raahilsha-z <[email protected]>
|
3 |
+
Date: Wed, 7 Jul 2021 15:57:46 -0400
|
4 |
+
Subject: [PATCH] fix numeric literals flag
|
5 |
+
|
6 |
+
---
|
7 |
+
CMakeLists.txt | 3 +++
|
8 |
+
1 file changed, 3 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
11 |
+
index 7cf86f74b..e07fd430a 100644
|
12 |
+
--- a/CMakeLists.txt
|
13 |
+
+++ b/CMakeLists.txt
|
14 |
+
@@ -420,6 +420,9 @@ endif()
|
15 |
+
|
16 |
+
# Boost (required)
|
17 |
+
include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake")
|
18 |
+
+if (NOT APPLE AND NOT WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
19 |
+
+ add_definitions(-fext-numeric-literals)
|
20 |
+
+endif()
|
21 |
+
|
22 |
+
### ---[ Create the config.h file
|
23 |
+
set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in")
|
24 |
+
--
|
25 |
+
2.32.0.windows.1
|
26 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/fix-pkgconfig.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cuda/common/CMakeLists.txt b/cuda/common/CMakeLists.txt
|
2 |
+
index b5775af..e7a2ff2 100644
|
3 |
+
--- a/cuda/common/CMakeLists.txt
|
4 |
+
+++ b/cuda/common/CMakeLists.txt
|
5 |
+
@@ -29,10 +29,10 @@ set(common_incs
|
6 |
+
)
|
7 |
+
|
8 |
+
include_directories(./include)
|
9 |
+
-#set(LIB_NAME pcl_${SUBSYS_NAME})
|
10 |
+
+set(LIB_NAME "pcl_${SUBSYS_NAME}")
|
11 |
+
set(EXT_DEPS CUDA)
|
12 |
+
-#PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
|
13 |
+
-# "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
|
14 |
+
+PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC "${SUBSYS_DESC}"
|
15 |
+
+ PCL_DEPS "${SUBSYS_DEPS}" EXT_DEPS "" HEADER_ONLY)
|
16 |
+
|
17 |
+
# Install include files
|
18 |
+
PCL_ADD_INCLUDES(${SUBSYS_NAME} "cuda" ${incs})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/install-examples.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
|
2 |
+
index 91f2404..18f5a24 100644
|
3 |
+
--- a/cmake/pcl_targets.cmake
|
4 |
+
+++ b/cmake/pcl_targets.cmake
|
5 |
+
@@ -473,6 +473,8 @@ macro(PCL_ADD_EXAMPLE _name)
|
6 |
+
# add target to list of example targets created at the parent scope
|
7 |
+
list(APPEND PCL_EXAMPLES_ALL_TARGETS ${_name})
|
8 |
+
set(PCL_EXAMPLES_ALL_TARGETS "${PCL_EXAMPLES_ALL_TARGETS}" PARENT_SCOPE)
|
9 |
+
+
|
10 |
+
+ install(TARGETS ${_name} RUNTIME DESTINATION ${BIN_INSTALL_DIR})
|
11 |
+
endmacro()
|
12 |
+
|
13 |
+
###############################################################################
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/no-absolute.patch
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
2 |
+
index 4137ed1..167fde2 100644
|
3 |
+
--- a/PCLConfig.cmake.in
|
4 |
+
+++ b/PCLConfig.cmake.in
|
5 |
+
@@ -230,7 +230,7 @@ macro(find_flann)
|
6 |
+
if(PCL_ALL_IN_ONE_INSTALLER)
|
7 |
+
set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann")
|
8 |
+
elseif(NOT FLANN_ROOT)
|
9 |
+
- set(FLANN_ROOT "@FLANN_ROOT@")
|
10 |
+
+ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}")
|
11 |
+
endif()
|
12 |
+
|
13 |
+
set(FLANN_USE_STATIC @FLANN_USE_STATIC@)
|
14 |
+
@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
|
15 |
+
# pcl_message("PCL found into a build tree.")
|
16 |
+
set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h
|
17 |
+
set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
|
18 |
+
- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
|
19 |
+
else()
|
20 |
+
pcl_report_not_found("PCL can not be found on this machine")
|
21 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/pcl_config.patch
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 2f4952e1767ad5b0349a03ee56d676d226102381 Mon Sep 17 00:00:00 2001
|
2 |
+
From: raahilsha-z <[email protected]>
|
3 |
+
Date: Wed, 7 Jul 2021 15:59:12 -0400
|
4 |
+
Subject: [PATCH] pcl_config
|
5 |
+
|
6 |
+
---
|
7 |
+
PCLConfig.cmake.in | 12 +++---------
|
8 |
+
1 file changed, 3 insertions(+), 9 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
11 |
+
index a1283a810..4137ed18c 100644
|
12 |
+
--- a/PCLConfig.cmake.in
|
13 |
+
+++ b/PCLConfig.cmake.in
|
14 |
+
@@ -384,6 +384,7 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
|
15 |
+
if(WIN32 AND NOT MINGW)
|
16 |
+
# PCLConfig.cmake is installed to PCL_ROOT/cmake
|
17 |
+
get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
|
18 |
+
+ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
|
19 |
+
if(EXISTS "${PCL_ROOT}/3rdParty")
|
20 |
+
set(PCL_ALL_IN_ONE_INSTALLER ON)
|
21 |
+
endif()
|
22 |
+
@@ -393,16 +394,9 @@ else()
|
23 |
+
endif()
|
24 |
+
|
25 |
+
# check whether PCLConfig.cmake is found into a PCL installation or in a build tree
|
26 |
+
-if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
|
27 |
+
- # Found a PCL installation
|
28 |
+
- # pcl_message("Found a PCL installation")
|
29 |
+
- set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
30 |
+
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
|
31 |
+
-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
32 |
+
- # Found a non-standard (likely ANDROID) PCL installation
|
33 |
+
- # pcl_message("Found a PCL installation")
|
34 |
+
+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
|
35 |
+
set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include")
|
36 |
+
- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
|
37 |
+
+ set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@")
|
38 |
+
elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
|
39 |
+
# Found PCLConfig.cmake in a build tree of PCL
|
40 |
+
# pcl_message("PCL found into a build tree.")
|
41 |
+
--
|
42 |
+
2.32.0.windows.1
|
43 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/pcl_utils.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 6f4e2fea829b5986863403d6a611c52c5ac8b2a9 Mon Sep 17 00:00:00 2001
|
2 |
+
From: raahilsha-z <[email protected]>
|
3 |
+
Date: Wed, 7 Jul 2021 16:00:30 -0400
|
4 |
+
Subject: [PATCH] pcl_utils
|
5 |
+
|
6 |
+
---
|
7 |
+
cmake/pcl_utils.cmake | 13 ++-----------
|
8 |
+
1 file changed, 2 insertions(+), 11 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
|
11 |
+
index d87d02da9..7c951bfd5 100644
|
12 |
+
--- a/cmake/pcl_utils.cmake
|
13 |
+
+++ b/cmake/pcl_utils.cmake
|
14 |
+
@@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS)
|
15 |
+
if(NOT DEFINED LIB_INSTALL_DIR)
|
16 |
+
set(LIB_INSTALL_DIR "lib")
|
17 |
+
endif()
|
18 |
+
- if(NOT ANDROID)
|
19 |
+
- set(INCLUDE_INSTALL_ROOT
|
20 |
+
- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
21 |
+
- else()
|
22 |
+
- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
|
23 |
+
- endif()
|
24 |
+
+ set(INCLUDE_INSTALL_ROOT "include")
|
25 |
+
set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
|
26 |
+
set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
27 |
+
set(BIN_INSTALL_DIR "bin")
|
28 |
+
set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
|
29 |
+
- if(WIN32 AND NOT MINGW)
|
30 |
+
- set(PCLCONFIG_INSTALL_DIR "cmake")
|
31 |
+
- else()
|
32 |
+
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
33 |
+
- endif()
|
34 |
+
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
|
35 |
+
endmacro()
|
36 |
+
|
37 |
+
|
38 |
+
--
|
39 |
+
2.32.0.windows.1
|
40 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/portfile.cmake
ADDED
@@ -0,0 +1,127 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO PointCloudLibrary/pcl
|
4 |
+
REF f36a69a5e89953708990c4669317f989d532cf08 # pcl-1.12.0
|
5 |
+
SHA512 dbbd0adbb08949ddef2789e0021b6ca9727be33c7193d0bb135c61def09a42ed6a71333f06b6fad407010ecb4b73c19f087f7520386b92a008e90c254eafe422
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
add-gcc-version-check.patch
|
9 |
+
fix-check-sse.patch
|
10 |
+
fix-find-qhull.patch
|
11 |
+
fix-numeric-literals-flag.patch
|
12 |
+
pcl_config.patch
|
13 |
+
pcl_utils.patch
|
14 |
+
remove-broken-targets.patch
|
15 |
+
fix-cmake_find_library_suffixes.patch
|
16 |
+
fix-pkgconfig.patch # Remove this patch in the next update
|
17 |
+
fix-namespace-cub.patch # Remove this patch in the next update
|
18 |
+
fix-error-C3052.patch # Remove this patch in the next update
|
19 |
+
fix-find-libusb.patch
|
20 |
+
install-examples.patch
|
21 |
+
no-absolute.patch
|
22 |
+
Workaround-ICE-in-release.patch
|
23 |
+
)
|
24 |
+
|
25 |
+
file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake"
|
26 |
+
"${SOURCE_PATH}/cmake/Modules/Findlibusb.cmake"
|
27 |
+
)
|
28 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
|
29 |
+
|
30 |
+
if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
|
31 |
+
message(FATAL_ERROR "Feature cuda only supports 64-bit compilation.")
|
32 |
+
endif()
|
33 |
+
|
34 |
+
if ("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
35 |
+
message(FATAL_ERROR "Feature tools only supports dynamic build")
|
36 |
+
endif()
|
37 |
+
|
38 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
39 |
+
FEATURES
|
40 |
+
openni2 WITH_OPENNI2
|
41 |
+
qt WITH_QT
|
42 |
+
pcap WITH_PCAP
|
43 |
+
cuda WITH_CUDA
|
44 |
+
cuda BUILD_CUDA
|
45 |
+
cuda BUILD_GPU
|
46 |
+
tools BUILD_tools
|
47 |
+
opengl WITH_OPENGL
|
48 |
+
libusb WITH_LIBUSB
|
49 |
+
visualization WITH_VTK
|
50 |
+
visualization BUILD_visualization
|
51 |
+
examples BUILD_examples
|
52 |
+
apps BUILD_apps
|
53 |
+
# These 2 apps need openni1
|
54 |
+
#apps BUILD_apps_in_hand_scanner
|
55 |
+
#apps BUILD_apps_3d_rec_framework
|
56 |
+
simulation BUILD_simulation
|
57 |
+
)
|
58 |
+
|
59 |
+
vcpkg_cmake_configure(
|
60 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
61 |
+
OPTIONS
|
62 |
+
# BUILD
|
63 |
+
-DBUILD_surface_on_nurbs=ON
|
64 |
+
# PCL
|
65 |
+
-DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
|
66 |
+
-DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
|
67 |
+
-DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS}
|
68 |
+
-DPCL_SHARED_LIBS=${PCL_SHARED_LIBS}
|
69 |
+
# WITH
|
70 |
+
-DWITH_PNG=ON
|
71 |
+
-DWITH_QHULL=ON
|
72 |
+
-DWITH_OPENNI=OFF
|
73 |
+
-DWITH_ENSENSO=OFF
|
74 |
+
-DWITH_DAVIDSDK=OFF
|
75 |
+
-DWITH_DSSDK=OFF
|
76 |
+
-DWITH_RSSDK=OFF
|
77 |
+
-DWITH_RSSDK2=OFF
|
78 |
+
-DWITH_OPENMP=OFF
|
79 |
+
# FEATURES
|
80 |
+
${FEATURE_OPTIONS}
|
81 |
+
MAYBE_UNUSED_VARIABLES
|
82 |
+
PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32
|
83 |
+
)
|
84 |
+
|
85 |
+
vcpkg_cmake_install()
|
86 |
+
vcpkg_cmake_config_fixup()
|
87 |
+
vcpkg_copy_pdbs()
|
88 |
+
|
89 |
+
if (WITH_OPENNI2)
|
90 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
91 |
+
file(GLOB PCL_PKGCONFIG_DBGS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
|
92 |
+
foreach (PCL_PKGCONFIG IN LISTS PCL_PKGCONFIG_DBGS)
|
93 |
+
file(READ "${PCL_PKGCONFIG}" PCL_PC_DBG)
|
94 |
+
if (PCL_PC_DBG MATCHES "libopenni2")
|
95 |
+
string(REPLACE "libopenni2" "" PCL_PC_DBG "${PCL_PC_DBG}")
|
96 |
+
string(REPLACE "Libs: " "Libs: -lKinect10 -lOpenNI2 " PCL_PC_DBG "${PCL_PC_DBG}")
|
97 |
+
file(WRITE "${PCL_PKGCONFIG}" "${PCL_PC_DBG}")
|
98 |
+
endif()
|
99 |
+
endforeach()
|
100 |
+
endif()
|
101 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
102 |
+
file(GLOB PCL_PKGCONFIG_RELS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
|
103 |
+
foreach (PCL_PKGCONFIG IN LISTS PCL_PKGCONFIG_RELS)
|
104 |
+
file(READ "${PCL_PKGCONFIG}" PCL_PC_REL)
|
105 |
+
if (PCL_PC_REL MATCHES "libopenni2")
|
106 |
+
string(REPLACE "libopenni2" "" PCL_PC_REL "${PCL_PC_REL}")
|
107 |
+
string(REPLACE "Libs: " "Libs: -lKinect10 -lOpenNI2 " PCL_PC_REL "${PCL_PC_REL}")
|
108 |
+
file(WRITE "${PCL_PKGCONFIG}" "${PCL_PC_REL}")
|
109 |
+
endif()
|
110 |
+
endforeach()
|
111 |
+
endif()
|
112 |
+
endif()
|
113 |
+
vcpkg_fixup_pkgconfig()
|
114 |
+
|
115 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
116 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
117 |
+
|
118 |
+
if(BUILD_tools OR BUILD_apps OR BUILD_examples)
|
119 |
+
file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
120 |
+
file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
121 |
+
file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl")
|
122 |
+
file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG})
|
123 |
+
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl")
|
124 |
+
endif()
|
125 |
+
|
126 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
127 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/remove-broken-targets.patch
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 1b2613e1df507fd868b4971294f9a28183ce2e6c Mon Sep 17 00:00:00 2001
|
2 |
+
From: raahilsha-z <[email protected]>
|
3 |
+
Date: Wed, 7 Jul 2021 16:01:03 -0400
|
4 |
+
Subject: [PATCH] remove broken targets
|
5 |
+
|
6 |
+
---
|
7 |
+
tools/CMakeLists.txt | 9 ---------
|
8 |
+
1 file changed, 9 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
11 |
+
index 5bfe6e94c..7abf3d746 100644
|
12 |
+
--- a/tools/CMakeLists.txt
|
13 |
+
+++ b/tools/CMakeLists.txt
|
14 |
+
@@ -123,15 +123,6 @@ target_link_libraries(pcl_concatenate_points_pcd pcl_common pcl_io)
|
15 |
+
PCL_ADD_EXECUTABLE(pcl_poisson_reconstruction COMPONENT ${SUBSYS_NAME} SOURCES poisson_reconstruction.cpp)
|
16 |
+
target_link_libraries(pcl_poisson_reconstruction pcl_common pcl_io pcl_surface)
|
17 |
+
|
18 |
+
-PCL_ADD_EXECUTABLE(pcl_train_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES train_linemod_template.cpp)
|
19 |
+
-target_link_libraries(pcl_train_linemod_template pcl_common pcl_io pcl_segmentation pcl_recognition)
|
20 |
+
-
|
21 |
+
-PCL_ADD_EXECUTABLE(pcl_match_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES match_linemod_template.cpp)
|
22 |
+
-target_link_libraries(pcl_match_linemod_template pcl_common pcl_io pcl_recognition)
|
23 |
+
-
|
24 |
+
-PCL_ADD_EXECUTABLE(pcl_linemod_detection COMPONENT ${SUBSYS_NAME} SOURCES linemod_detection.cpp)
|
25 |
+
-target_link_libraries(pcl_linemod_detection pcl_common pcl_io pcl_recognition)
|
26 |
+
-
|
27 |
+
PCL_ADD_EXECUTABLE(pcl_fast_bilateral_filter COMPONENT ${SUBSYS_NAME} SOURCES fast_bilateral_filter.cpp)
|
28 |
+
target_link_libraries(pcl_fast_bilateral_filter pcl_common pcl_io pcl_filters)
|
29 |
+
|
30 |
+
--
|
31 |
+
2.32.0.windows.1
|
32 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package pcl provides CMake targets:
|
2 |
+
|
3 |
+
find_package(PCL CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE ${PCL_LIBRARIES})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcl/vcpkg.json
ADDED
@@ -0,0 +1,153 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pcl",
|
3 |
+
"version": "1.12.0",
|
4 |
+
"port-version": 6,
|
5 |
+
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
|
6 |
+
"homepage": "https://github.com/PointCloudLibrary/pcl",
|
7 |
+
"license": "BSD-3-Clause",
|
8 |
+
"supports": "!(arm64 & windows)",
|
9 |
+
"dependencies": [
|
10 |
+
"boost-asio",
|
11 |
+
"boost-date-time",
|
12 |
+
"boost-dynamic-bitset",
|
13 |
+
"boost-filesystem",
|
14 |
+
"boost-foreach",
|
15 |
+
"boost-graph",
|
16 |
+
"boost-interprocess",
|
17 |
+
"boost-iostreams",
|
18 |
+
"boost-multi-array",
|
19 |
+
"boost-property-map",
|
20 |
+
"boost-ptr-container",
|
21 |
+
"boost-random",
|
22 |
+
"boost-signals2",
|
23 |
+
"boost-sort",
|
24 |
+
"boost-system",
|
25 |
+
"boost-thread",
|
26 |
+
"boost-uuid",
|
27 |
+
"eigen3",
|
28 |
+
"flann",
|
29 |
+
"libpng",
|
30 |
+
"qhull",
|
31 |
+
{
|
32 |
+
"name": "vcpkg-cmake",
|
33 |
+
"host": true
|
34 |
+
},
|
35 |
+
{
|
36 |
+
"name": "vcpkg-cmake-config",
|
37 |
+
"host": true
|
38 |
+
}
|
39 |
+
],
|
40 |
+
"features": {
|
41 |
+
"apps": {
|
42 |
+
"description": "Build application examples/samples that show how PCL works",
|
43 |
+
"dependencies": [
|
44 |
+
{
|
45 |
+
"name": "pcl",
|
46 |
+
"default-features": false,
|
47 |
+
"features": [
|
48 |
+
"opengl",
|
49 |
+
"openni2",
|
50 |
+
"qt",
|
51 |
+
"vtk"
|
52 |
+
]
|
53 |
+
}
|
54 |
+
]
|
55 |
+
},
|
56 |
+
"cuda": {
|
57 |
+
"description": "CUDA support for PCL",
|
58 |
+
"dependencies": [
|
59 |
+
"cuda"
|
60 |
+
]
|
61 |
+
},
|
62 |
+
"examples": {
|
63 |
+
"description": "Build PCL examples",
|
64 |
+
"dependencies": [
|
65 |
+
"vtk"
|
66 |
+
]
|
67 |
+
},
|
68 |
+
"libusb": {
|
69 |
+
"description": "Build USB RGBD-Camera drivers",
|
70 |
+
"dependencies": [
|
71 |
+
"libusb"
|
72 |
+
]
|
73 |
+
},
|
74 |
+
"opengl": {
|
75 |
+
"description": "OpenGL support for PCL"
|
76 |
+
},
|
77 |
+
"openni2": {
|
78 |
+
"description": "OpenNI2 support for PCL",
|
79 |
+
"dependencies": [
|
80 |
+
"openni2",
|
81 |
+
{
|
82 |
+
"name": "pcl",
|
83 |
+
"default-features": false,
|
84 |
+
"features": [
|
85 |
+
"libusb"
|
86 |
+
],
|
87 |
+
"platform": "!windows"
|
88 |
+
}
|
89 |
+
]
|
90 |
+
},
|
91 |
+
"pcap": {
|
92 |
+
"description": "PCAP support for PCL",
|
93 |
+
"dependencies": [
|
94 |
+
{
|
95 |
+
"name": "libpcap",
|
96 |
+
"platform": "!windows"
|
97 |
+
},
|
98 |
+
{
|
99 |
+
"name": "winpcap",
|
100 |
+
"platform": "windows"
|
101 |
+
}
|
102 |
+
]
|
103 |
+
},
|
104 |
+
"qt": {
|
105 |
+
"description": "Qt support for PCL",
|
106 |
+
"dependencies": [
|
107 |
+
{
|
108 |
+
"name": "vtk",
|
109 |
+
"features": [
|
110 |
+
"qt"
|
111 |
+
]
|
112 |
+
}
|
113 |
+
]
|
114 |
+
},
|
115 |
+
"simulation": {
|
116 |
+
"description": "Build Point Cloud Library Simulation",
|
117 |
+
"dependencies": [
|
118 |
+
"glew",
|
119 |
+
{
|
120 |
+
"name": "pcl",
|
121 |
+
"default-features": false,
|
122 |
+
"features": [
|
123 |
+
"opengl"
|
124 |
+
]
|
125 |
+
}
|
126 |
+
]
|
127 |
+
},
|
128 |
+
"tools": {
|
129 |
+
"description": "Build PCL utilities",
|
130 |
+
"dependencies": [
|
131 |
+
"boost-accumulators"
|
132 |
+
]
|
133 |
+
},
|
134 |
+
"visualization": {
|
135 |
+
"description": "Build visualization",
|
136 |
+
"dependencies": [
|
137 |
+
"vtk"
|
138 |
+
]
|
139 |
+
},
|
140 |
+
"vtk": {
|
141 |
+
"description": "An alias for visualization",
|
142 |
+
"dependencies": [
|
143 |
+
{
|
144 |
+
"name": "pcl",
|
145 |
+
"default-features": false,
|
146 |
+
"features": [
|
147 |
+
"visualization"
|
148 |
+
]
|
149 |
+
}
|
150 |
+
]
|
151 |
+
}
|
152 |
+
}
|
153 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/export-cmake-targets.patch
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200
|
2 |
+
+++ b/CMakeLists.txt 2021-06-18 18:08:24.162881000 +0200
|
3 |
+
@@ -934,10 +934,19 @@
|
4 |
+
# Installation
|
5 |
+
SET(CMAKE_INSTALL_ALWAYS 1)
|
6 |
+
|
7 |
+
-INSTALL(TARGETS ${targets}
|
8 |
+
+foreach(target ${targets})
|
9 |
+
+ INSTALL(TARGETS ${target}
|
10 |
+
+ EXPORT pcre-targets
|
11 |
+
RUNTIME DESTINATION bin
|
12 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
13 |
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
14 |
+
+ target_include_directories(${target} PUBLIC $<INSTALL_INTERFACE:include>)
|
15 |
+
+endforeach()
|
16 |
+
+
|
17 |
+
+INSTALL(EXPORT pcre-targets
|
18 |
+
+ NAMESPACE unofficial::pcre::
|
19 |
+
+ FILE unofficial-pcre-targets.cmake
|
20 |
+
+ DESTINATION "share/unofficial-pcre")
|
21 |
+
|
22 |
+
INSTALL(FILES ${PCRE_HEADERS} ${PCREPOSIX_HEADERS} DESTINATION include)
|
23 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch
ADDED
@@ -0,0 +1,161 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
Index: CMakeLists.txt
|
2 |
+
===================================================================
|
3 |
+
--- CMakeLists.txt (revision 1767)
|
4 |
+
+++ CMakeLists.txt (working copy)
|
5 |
+
@@ -436,6 +436,12 @@
|
6 |
+
@ONLY)
|
7 |
+
ENDIF(PCRE_BUILD_PCRECPP)
|
8 |
+
|
9 |
+
+# Make sure to not link debug libs
|
10 |
+
+# against release libs and vice versa
|
11 |
+
+IF(WIN32)
|
12 |
+
+ SET(CMAKE_DEBUG_POSTFIX "d")
|
13 |
+
+ENDIF(WIN32)
|
14 |
+
+
|
15 |
+
# Generate pkg-config files
|
16 |
+
SET(PACKAGE_VERSION "${PCRE_MAJOR}.${PCRE_MINOR}")
|
17 |
+
SET(prefix "${CMAKE_INSTALL_PREFIX}")
|
18 |
+
@@ -442,6 +448,9 @@
|
19 |
+
SET(exec_prefix "\${prefix}")
|
20 |
+
SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
|
21 |
+
SET(includedir "\${prefix}/include")
|
22 |
+
+IF(WIN32 AND (CMAKE_BUILD_TYPE MATCHES Debug))
|
23 |
+
+ SET(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX})
|
24 |
+
+ENDIF()
|
25 |
+
IF(NOT BUILD_SHARED_LIBS)
|
26 |
+
SET(PCRE_STATIC_CFLAG "-DPCRE_STATIC")
|
27 |
+
ENDIF(NOT BUILD_SHARED_LIBS)
|
28 |
+
@@ -659,11 +668,6 @@
|
29 |
+
ENDIF(MSVC)
|
30 |
+
|
31 |
+
SET(CMAKE_INCLUDE_CURRENT_DIR 1)
|
32 |
+
-# needed to make sure to not link debug libs
|
33 |
+
-# against release libs and vice versa
|
34 |
+
-IF(WIN32)
|
35 |
+
- SET(CMAKE_DEBUG_POSTFIX "d")
|
36 |
+
-ENDIF(WIN32)
|
37 |
+
|
38 |
+
SET(targets)
|
39 |
+
|
40 |
+
Index: configure.ac
|
41 |
+
===================================================================
|
42 |
+
--- configure.ac (revision 1767)
|
43 |
+
+++ configure.ac (working copy)
|
44 |
+
@@ -1044,6 +1044,9 @@
|
45 |
+
AM_CONDITIONAL([WITH_GCOV],[test "x$enable_coverage" = "xyes"])
|
46 |
+
|
47 |
+
# Produce these files, in addition to config.h.
|
48 |
+
+# LIB_POSTFIX is used by CMakeLists.txt for Windows debug builds.
|
49 |
+
+# Pass empty LIB_POSTFIX to *.pc files and pcre-config here.
|
50 |
+
+AC_SUBST(LIB_POSTFIX)
|
51 |
+
AC_CONFIG_FILES(
|
52 |
+
Makefile
|
53 |
+
libpcre.pc
|
54 |
+
Index: libpcre.pc.in
|
55 |
+
===================================================================
|
56 |
+
--- libpcre.pc.in (revision 1767)
|
57 |
+
+++ libpcre.pc.in (working copy)
|
58 |
+
@@ -8,6 +8,6 @@
|
59 |
+
Name: libpcre
|
60 |
+
Description: PCRE - Perl compatible regular expressions C library with 8 bit character support
|
61 |
+
Version: @PACKAGE_VERSION@
|
62 |
+
-Libs: -L${libdir} -lpcre
|
63 |
+
+Libs: -L${libdir} -lpcre@LIB_POSTFIX@
|
64 |
+
Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
65 |
+
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
66 |
+
Index: libpcre16.pc.in
|
67 |
+
===================================================================
|
68 |
+
--- libpcre16.pc.in (revision 1767)
|
69 |
+
+++ libpcre16.pc.in (working copy)
|
70 |
+
@@ -8,6 +8,6 @@
|
71 |
+
Name: libpcre16
|
72 |
+
Description: PCRE - Perl compatible regular expressions C library with 16 bit character support
|
73 |
+
Version: @PACKAGE_VERSION@
|
74 |
+
-Libs: -L${libdir} -lpcre16
|
75 |
+
+Libs: -L${libdir} -lpcre16@LIB_POSTFIX@
|
76 |
+
Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
77 |
+
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
78 |
+
Index: libpcre32.pc.in
|
79 |
+
===================================================================
|
80 |
+
--- libpcre32.pc.in (revision 1767)
|
81 |
+
+++ libpcre32.pc.in (working copy)
|
82 |
+
@@ -8,6 +8,6 @@
|
83 |
+
Name: libpcre32
|
84 |
+
Description: PCRE - Perl compatible regular expressions C library with 32 bit character support
|
85 |
+
Version: @PACKAGE_VERSION@
|
86 |
+
-Libs: -L${libdir} -lpcre32
|
87 |
+
+Libs: -L${libdir} -lpcre32@LIB_POSTFIX@
|
88 |
+
Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
89 |
+
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
90 |
+
Index: libpcrecpp.pc.in
|
91 |
+
===================================================================
|
92 |
+
--- libpcrecpp.pc.in (revision 1767)
|
93 |
+
+++ libpcrecpp.pc.in (working copy)
|
94 |
+
@@ -8,5 +8,5 @@
|
95 |
+
Name: libpcrecpp
|
96 |
+
Description: PCRECPP - C++ wrapper for PCRE
|
97 |
+
Version: @PACKAGE_VERSION@
|
98 |
+
-Libs: -L${libdir} -lpcre -lpcrecpp
|
99 |
+
+Libs: -L${libdir} -lpcre@LIB_POSTFIX@ -lpcrecpp@LIB_POSTFIX@
|
100 |
+
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
101 |
+
Index: libpcreposix.pc.in
|
102 |
+
===================================================================
|
103 |
+
--- libpcreposix.pc.in (revision 1767)
|
104 |
+
+++ libpcreposix.pc.in (working copy)
|
105 |
+
@@ -8,6 +8,6 @@
|
106 |
+
Name: libpcreposix
|
107 |
+
Description: PCREPosix - Posix compatible interface to libpcre
|
108 |
+
Version: @PACKAGE_VERSION@
|
109 |
+
-Libs: -L${libdir} -lpcreposix
|
110 |
+
+Libs: -L${libdir} -lpcreposix@LIB_POSTFIX@
|
111 |
+
Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
|
112 |
+
Requires.private: libpcre
|
113 |
+
Index: pcre-config.in
|
114 |
+
===================================================================
|
115 |
+
--- pcre-config.in (revision 1767)
|
116 |
+
+++ pcre-config.in (working copy)
|
117 |
+
@@ -91,7 +91,7 @@
|
118 |
+
;;
|
119 |
+
--libs-posix)
|
120 |
+
if test @enable_pcre8@ = yes ; then
|
121 |
+
- echo $libS$libR -lpcreposix -lpcre
|
122 |
+
+ echo $libS$libR -lpcreposix@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@
|
123 |
+
else
|
124 |
+
echo "${usage}" 1>&2
|
125 |
+
fi
|
126 |
+
@@ -98,7 +98,7 @@
|
127 |
+
;;
|
128 |
+
--libs)
|
129 |
+
if test @enable_pcre8@ = yes ; then
|
130 |
+
- echo $libS$libR -lpcre
|
131 |
+
+ echo $libS$libR -lpcre@LIB_POSTFIX@
|
132 |
+
else
|
133 |
+
echo "${usage}" 1>&2
|
134 |
+
fi
|
135 |
+
@@ -105,7 +105,7 @@
|
136 |
+
;;
|
137 |
+
--libs16)
|
138 |
+
if test @enable_pcre16@ = yes ; then
|
139 |
+
- echo $libS$libR -lpcre16
|
140 |
+
+ echo $libS$libR -lpcre16@LIB_POSTFIX@
|
141 |
+
else
|
142 |
+
echo "${usage}" 1>&2
|
143 |
+
fi
|
144 |
+
@@ -112,7 +112,7 @@
|
145 |
+
;;
|
146 |
+
--libs32)
|
147 |
+
if test @enable_pcre32@ = yes ; then
|
148 |
+
- echo $libS$libR -lpcre32
|
149 |
+
+ echo $libS$libR -lpcre32@LIB_POSTFIX@
|
150 |
+
else
|
151 |
+
echo "${usage}" 1>&2
|
152 |
+
fi
|
153 |
+
@@ -119,7 +119,7 @@
|
154 |
+
;;
|
155 |
+
--libs-cpp)
|
156 |
+
if test @enable_cpp@ = yes ; then
|
157 |
+
- echo $libS$libR -lpcrecpp -lpcre
|
158 |
+
+ echo $libS$libR -lpcrecpp@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@
|
159 |
+
else
|
160 |
+
echo "${usage}" 1>&2
|
161 |
+
fi
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200
|
2 |
+
+++ b/CMakeLists.txt 2021-06-18 17:59:59.155148900 +0200
|
3 |
+
@@ -77,7 +77,6 @@
|
4 |
+
# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
|
5 |
+
|
6 |
+
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
|
7 |
+
-CMAKE_POLICY(SET CMP0026 OLD)
|
8 |
+
|
9 |
+
# For FindReadline.cmake. This was changed to allow setting CMAKE_MODULE_PATH
|
10 |
+
# on the command line.
|
11 |
+
@@ -199,6 +198,7 @@
|
12 |
+
ENDIF(MINGW)
|
13 |
+
|
14 |
+
IF(MSVC)
|
15 |
+
+ add_definitions(/wd4703 /wd4146 /wd4308)
|
16 |
+
OPTION(PCRE_STATIC_RUNTIME
|
17 |
+
"ON=Compile against the static runtime (/MT)."
|
18 |
+
OFF)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/portfile.cmake
ADDED
@@ -0,0 +1,73 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(PCRE_VERSION 8.45)
|
2 |
+
set(EXPECTED_SHA 71f246c0abbf356222933ad1604cab87a1a2a3cd8054a0b9d6deb25e0735ce9f40f923d14cbd21f32fdac7283794270afcb0f221ad24662ac35934fcb73675cd)
|
3 |
+
set(PATCHES
|
4 |
+
# Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026
|
5 |
+
# Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors
|
6 |
+
# under x64-uwp and arm-uwp
|
7 |
+
pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch
|
8 |
+
# Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600
|
9 |
+
pcre-8.45_fix_postfix_for_debug_Windows_builds.patch
|
10 |
+
export-cmake-targets.patch)
|
11 |
+
|
12 |
+
vcpkg_from_sourceforge(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
REPO pcre/pcre
|
15 |
+
REF ${PCRE_VERSION}
|
16 |
+
FILENAME "pcre-${PCRE_VERSION}.zip"
|
17 |
+
SHA512 ${EXPECTED_SHA}
|
18 |
+
PATCHES ${PATCHES}
|
19 |
+
)
|
20 |
+
|
21 |
+
vcpkg_cmake_configure(
|
22 |
+
SOURCE_PATH ${SOURCE_PATH}
|
23 |
+
OPTIONS
|
24 |
+
-DPCRE_BUILD_TESTS=NO
|
25 |
+
-DPCRE_BUILD_PCREGREP=NO
|
26 |
+
-DPCRE_BUILD_PCRE32=YES
|
27 |
+
-DPCRE_BUILD_PCRE16=YES
|
28 |
+
-DPCRE_BUILD_PCRE8=YES
|
29 |
+
-DPCRE_SUPPORT_JIT=YES
|
30 |
+
-DPCRE_SUPPORT_UTF=YES
|
31 |
+
-DPCRE_SUPPORT_UNICODE_PROPERTIES=YES
|
32 |
+
# optional dependencies for PCREGREP
|
33 |
+
-DPCRE_SUPPORT_LIBBZ2=OFF
|
34 |
+
-DPCRE_SUPPORT_LIBZ=OFF
|
35 |
+
-DPCRE_SUPPORT_LIBEDIT=OFF
|
36 |
+
-DPCRE_SUPPORT_LIBREADLINE=OFF
|
37 |
+
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
|
38 |
+
# OPTIONS_RELEASE -DOPTIMIZE=1
|
39 |
+
# OPTIONS_DEBUG -DDEBUGGABLE=1
|
40 |
+
)
|
41 |
+
|
42 |
+
vcpkg_cmake_install()
|
43 |
+
|
44 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}")
|
45 |
+
|
46 |
+
foreach(FILE "${CURRENT_PACKAGES_DIR}/include/pcre.h" "${CURRENT_PACKAGES_DIR}/include/pcreposix.h")
|
47 |
+
file(READ ${FILE} PCRE_H)
|
48 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
49 |
+
string(REPLACE "defined(PCRE_STATIC)" "1" PCRE_H "${PCRE_H}")
|
50 |
+
else()
|
51 |
+
string(REPLACE "defined(PCRE_STATIC)" "0" PCRE_H "${PCRE_H}")
|
52 |
+
endif()
|
53 |
+
file(WRITE ${FILE} "${PCRE_H}")
|
54 |
+
endforeach()
|
55 |
+
|
56 |
+
vcpkg_fixup_pkgconfig()
|
57 |
+
|
58 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
59 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
60 |
+
|
61 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man")
|
62 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man")
|
63 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
|
64 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
65 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
66 |
+
else()
|
67 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config")
|
68 |
+
endif()
|
69 |
+
|
70 |
+
vcpkg_copy_pdbs()
|
71 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-pcre/unofficial-pcre-config.cmake" @ONLY)
|
72 |
+
|
73 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/unofficial-pcre-config.cmake
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-targets.cmake")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pcre",
|
3 |
+
"version": "8.45",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Perl Compatible Regular Expressions",
|
6 |
+
"homepage": "https://www.pcre.org/",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/pcre2-10.35_fix-uwp.patch
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt 2020-05-09 16:43:10.000000000 +0200
|
2 |
+
+++ b/CMakeLists.txt 2020-06-03 20:57:17.026182500 +0200
|
3 |
+
@@ -619,6 +619,7 @@
|
4 |
+
|
5 |
+
IF(MSVC)
|
6 |
+
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
|
7 |
+
+ add_compile_options(/wd4146)
|
8 |
+
ENDIF(MSVC)
|
9 |
+
|
10 |
+
SET(CMAKE_INCLUDE_CURRENT_DIR 1)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/portfile.cmake
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO PhilipHazel/pcre2
|
4 |
+
REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39
|
5 |
+
SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
pcre2-10.35_fix-uwp.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
12 |
+
|
13 |
+
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
14 |
+
set(JIT OFF)
|
15 |
+
else()
|
16 |
+
set(JIT ON)
|
17 |
+
endif()
|
18 |
+
|
19 |
+
vcpkg_cmake_configure(
|
20 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
21 |
+
OPTIONS
|
22 |
+
-DBUILD_STATIC_LIBS=${BUILD_STATIC}
|
23 |
+
-DPCRE2_BUILD_PCRE2_8=ON
|
24 |
+
-DPCRE2_BUILD_PCRE2_16=ON
|
25 |
+
-DPCRE2_BUILD_PCRE2_32=ON
|
26 |
+
-DPCRE2_SUPPORT_JIT=${JIT}
|
27 |
+
-DPCRE2_SUPPORT_UNICODE=ON
|
28 |
+
-DPCRE2_BUILD_TESTS=OFF
|
29 |
+
-DPCRE2_BUILD_PCRE2GREP=OFF
|
30 |
+
)
|
31 |
+
|
32 |
+
vcpkg_cmake_install()
|
33 |
+
vcpkg_copy_pdbs()
|
34 |
+
|
35 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H)
|
36 |
+
if(BUILD_STATIC)
|
37 |
+
string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}")
|
38 |
+
else()
|
39 |
+
string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}")
|
40 |
+
endif()
|
41 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}")
|
42 |
+
|
43 |
+
vcpkg_fixup_pkgconfig()
|
44 |
+
|
45 |
+
# The cmake file provided by pcre2 has some problems, so don't use it for now.
|
46 |
+
#vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
|
47 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake")
|
48 |
+
|
49 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man")
|
50 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
|
51 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
52 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man")
|
53 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
54 |
+
|
55 |
+
if(BUILD_STATIC)
|
56 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
57 |
+
elseif(VCPKG_TARGET_IS_WINDOWS)
|
58 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
|
59 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config")
|
60 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
|
61 |
+
endif()
|
62 |
+
endif()
|
63 |
+
|
64 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pcre2/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pcre2",
|
3 |
+
"version": "10.39",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
|
6 |
+
"homepage": "https://github.com/PhilipHazel/pcre2",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/cmake-project-include.cmake
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
if(WIN32)
|
2 |
+
add_compile_definitions(NOMINMAX)
|
3 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/portfile.cmake
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO PDAL/CAPI
|
6 |
+
REF v2.1.0
|
7 |
+
SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
OPTIONS
|
14 |
+
"-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
|
15 |
+
-DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF
|
16 |
+
-DPDALC_ENABLE_DOCS:BOOL=OFF
|
17 |
+
-DPDALC_ENABLE_TESTS:BOOL=OFF
|
18 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON
|
19 |
+
)
|
20 |
+
|
21 |
+
vcpkg_cmake_install()
|
22 |
+
vcpkg_copy_pdbs()
|
23 |
+
|
24 |
+
# Remove headers from debug
|
25 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
26 |
+
|
27 |
+
# Install copyright
|
28 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal-c/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pdal-c",
|
3 |
+
"version-string": "2.1",
|
4 |
+
"description": "C API for the Point Data Abstraction Library (PDAL)",
|
5 |
+
"homepage": "https://github.com/PDAL/CAPI#readme",
|
6 |
+
"supports": "!(windows & staticcrt)",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "pdal",
|
10 |
+
"default-features": false
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/0002-no-source-dir-writes.patch
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index dc146d1..9b82544 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -140,7 +140,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
|
6 |
+
|
7 |
+
configure_file(
|
8 |
+
"${PROJECT_SOURCE_DIR}/gitsha.cpp.in"
|
9 |
+
- "${PROJECT_SOURCE_DIR}/pdal/gitsha.cpp")
|
10 |
+
+ "${PROJECT_BINARY_DIR}/pdal/gitsha.cpp")
|
11 |
+
|
12 |
+
# needs to come before configuration of pdal_features
|
13 |
+
if(APPLE)
|
14 |
+
@@ -201,6 +201,7 @@ file(GLOB BASE_SRCS
|
15 |
+
${PDAL_IO_DIR}/*.cpp
|
16 |
+
${PDAL_KERNELS_DIR}/*.cpp
|
17 |
+
${PDAL_SRC_DIR}/*.cpp
|
18 |
+
+ ${PROJECT_BINARY_DIR}/pdal/gitsha.cpp
|
19 |
+
${PDAL_SRC_DIR}/compression/*.cpp)
|
20 |
+
file(GLOB_RECURSE PRIVATE_SRCS
|
21 |
+
${PDAL_FILTERS_DIR}/private/*.cpp
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/0003-fix-copy-vendor.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index e918a3e..a3f9a03 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR}
|
6 |
+
install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp}
|
7 |
+
DESTINATION include/pdal
|
8 |
+
)
|
9 |
+
+# Instaqll vendor headers
|
10 |
+
+install(DIRECTORY
|
11 |
+
+ ${PDAL_VENDOR_DIR}/arbiter
|
12 |
+
+ ${PDAL_VENDOR_DIR}/kazhdan
|
13 |
+
+ ${PDAL_VENDOR_DIR}/nanoflann
|
14 |
+
+ DESTINATION include/pdal/vendor
|
15 |
+
+ FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h"
|
16 |
+
+ PATTERN "private" EXCLUDE
|
17 |
+
+)
|
18 |
+
|
19 |
+
#
|
20 |
+
# CPACK
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-dependency.patch
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 42cca1e..43b0ced 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
|
6 |
+
target_link_libraries(${PDAL_BASE_LIB_NAME}
|
7 |
+
PRIVATE
|
8 |
+
${CMAKE_THREAD_LIBS_INIT}
|
9 |
+
- ${GDAL_LIBRARY}
|
10 |
+
+ ${GDAL_LIBRARIES}
|
11 |
+
${GEOTIFF_LIBRARY}
|
12 |
+
${LASZIP_LIBRARY}
|
13 |
+
${LIBXML2_LIBRARIES}
|
14 |
+
diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
|
15 |
+
index bfaa5b2..e73ec9e 100644
|
16 |
+
--- a/cmake/zstd.cmake
|
17 |
+
+++ b/cmake/zstd.cmake
|
18 |
+
@@ -4,7 +4,15 @@
|
19 |
+
option(WITH_ZSTD
|
20 |
+
"Build support for compression/decompression with Zstd." TRUE)
|
21 |
+
if (WITH_ZSTD)
|
22 |
+
- find_package(ZSTD QUIET)
|
23 |
+
+ find_package(zstd CONFIG REQUIRED)
|
24 |
+
+ set(ZSTD_FOUND TRUE)
|
25 |
+
+ set(ZSTD_INCLUDE_DIRS "")
|
26 |
+
+ if(TARGET zstd::libzstd_static)
|
27 |
+
+ set(ZSTD_LIBRARIES zstd::libzstd_static)
|
28 |
+
+ set(ZSTD_STATIC_LIB zstd::libzstd_static)
|
29 |
+
+ else()
|
30 |
+
+ set(ZSTD_LIBRARIES zstd::libzstd_shared)
|
31 |
+
+ endif()
|
32 |
+
set_package_properties(ZSTD PROPERTIES TYPE
|
33 |
+
PURPOSE "General compression support")
|
34 |
+
if (ZSTD_FOUND)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-find-library-suffix.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake
|
2 |
+
index dae98ea..edab055 100644
|
3 |
+
--- a/cmake/libraries.cmake
|
4 |
+
+++ b/cmake/libraries.cmake
|
5 |
+
@@ -3,11 +3,7 @@
|
6 |
+
option(PDAL_BUILD_STATIC "Build PDAL as a static library" OFF)
|
7 |
+
if (PDAL_BUILD_STATIC)
|
8 |
+
set(PDAL_LIB_TYPE "STATIC")
|
9 |
+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
10 |
+
else ()
|
11 |
+
set(PDAL_LIB_TYPE "SHARED")
|
12 |
+
- if (WIN32)
|
13 |
+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX})
|
14 |
+
- endif()
|
15 |
+
endif()
|
16 |
+
mark_as_advanced(PDAL_BUILD_STATIC)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/fix-unix-compiler-options.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 679b4e7..08965d9 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -187,7 +187,7 @@ add_subdirectory(apps)
|
6 |
+
# so that users only need link libpdalcpp.
|
7 |
+
#
|
8 |
+
if (APPLE)
|
9 |
+
- set(PDAL_REEXPORT "-Wl,-reexport_library,$<TARGET_FILE:${PDAL_UTIL_LIB_NAME}>")
|
10 |
+
+ set(PDAL_REEXPORT "-Wl$<COMMA>-reexport_library$<COMMA>$<TARGET_FILE:${PDAL_UTIL_LIB_NAME}>")
|
11 |
+
#
|
12 |
+
# This allows the rpath reference for the reexported library (above) to
|
13 |
+
# be found.
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/no-pkgconfig-requires.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in
|
2 |
+
index 6885221..cd2136c 100644
|
3 |
+
--- a/apps/pdal.pc.in
|
4 |
+
+++ b/apps/pdal.pc.in
|
5 |
+
@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include
|
6 |
+
|
7 |
+
Name: PDAL
|
8 |
+
Description: Point Data Abstraction Library
|
9 |
+
-Requires: @PKGCONFIG_LIBRARY_DEFINITIONS@
|
10 |
+
Version: @PDAL_VERSION@
|
11 |
+
Libs: -L${libdir} -l@PDAL_LIB_NAME@
|
12 |
+
Cflags: -I${includedir}/pdal @PDAL_CONFIG_DEFINITIONS@
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/no-rpath.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/rpath.cmake b/cmake/rpath.cmake
|
2 |
+
index ba486b7..4323a77 100644
|
3 |
+
--- a/cmake/rpath.cmake
|
4 |
+
+++ b/cmake/rpath.cmake
|
5 |
+
@@ -1,6 +1,7 @@
|
6 |
+
#
|
7 |
+
# Set options and variable related to OSX rpath.
|
8 |
+
#
|
9 |
+
+return()
|
10 |
+
|
11 |
+
# per http://www.cmake.org/Wiki/CMake_RPATH_handling
|
12 |
+
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/portfile.cmake
ADDED
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO PDAL/PDAL
|
6 |
+
REF 2.3.0
|
7 |
+
SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
0002-no-source-dir-writes.patch
|
11 |
+
0003-fix-copy-vendor.patch
|
12 |
+
fix-dependency.patch
|
13 |
+
use-vcpkg-boost.patch
|
14 |
+
fix-unix-compiler-options.patch
|
15 |
+
fix-find-library-suffix.patch
|
16 |
+
no-pkgconfig-requires.patch
|
17 |
+
no-rpath.patch
|
18 |
+
)
|
19 |
+
|
20 |
+
file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")
|
21 |
+
file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/pdalboost/boost" "${SOURCE_PATH}/vendor/pdalboost/libs")
|
22 |
+
|
23 |
+
# Prefer pristine CMake find modules + wrappers and config files from vcpkg.
|
24 |
+
foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD)
|
25 |
+
file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake")
|
26 |
+
endforeach()
|
27 |
+
|
28 |
+
unset(ENV{OSGEO4W_HOME})
|
29 |
+
|
30 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
31 |
+
FEATURES
|
32 |
+
draco BUILD_PLUGIN_DRACO
|
33 |
+
e57 BUILD_PLUGIN_E57
|
34 |
+
hdf5 BUILD_PLUGIN_HDF
|
35 |
+
i3s BUILD_PLUGIN_I3S
|
36 |
+
laszip WITH_LASZIP
|
37 |
+
lzma WITH_LZMA
|
38 |
+
pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD
|
39 |
+
zstd WITH_ZSTD
|
40 |
+
)
|
41 |
+
if(BUILD_PLUGIN_DRACO)
|
42 |
+
vcpkg_find_acquire_program(PKGCONFIG)
|
43 |
+
endif()
|
44 |
+
|
45 |
+
vcpkg_cmake_configure(
|
46 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
47 |
+
OPTIONS
|
48 |
+
-DPDAL_PLUGIN_INSTALL_PATH=.
|
49 |
+
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
|
50 |
+
-DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL
|
51 |
+
-DWITH_TESTS:BOOL=OFF
|
52 |
+
-DWITH_COMPLETION:BOOL=OFF
|
53 |
+
-DWITH_LAZPERF:BOOL=OFF
|
54 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON
|
55 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON
|
56 |
+
${FEATURE_OPTIONS}
|
57 |
+
MAYBE_UNUSED_VARIABLES
|
58 |
+
POSTGRESQL_LIBRARIES
|
59 |
+
)
|
60 |
+
|
61 |
+
vcpkg_cmake_install()
|
62 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL)
|
63 |
+
vcpkg_fixup_pkgconfig()
|
64 |
+
vcpkg_copy_pdbs()
|
65 |
+
|
66 |
+
# Install and cleanup executables
|
67 |
+
file(GLOB pdal_unsupported
|
68 |
+
"${CURRENT_PACKAGES_DIR}/bin/*.bat"
|
69 |
+
"${CURRENT_PACKAGES_DIR}/bin/pdal-config"
|
70 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin/*.bat"
|
71 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin/*.exe"
|
72 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config"
|
73 |
+
)
|
74 |
+
file(REMOVE ${pdal_unsupported})
|
75 |
+
vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN)
|
76 |
+
|
77 |
+
# Post-install clean-up
|
78 |
+
file(REMOVE_RECURSE
|
79 |
+
"${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/csf"
|
80 |
+
"${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/miniball"
|
81 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
82 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
83 |
+
)
|
84 |
+
|
85 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
86 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/usage
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package pdal provides CMake variables:
|
2 |
+
|
3 |
+
find_package(PDAL CONFIG REQUIRED)
|
4 |
+
target_include_directories(${PDAL_INCLUDE_DIRS})
|
5 |
+
target_link_libraries(main PRIVATE ${PDAL_LIBRARIES})
|
6 |
+
|
7 |
+
If necessary, override the default plugin search path by setting the
|
8 |
+
environment variable PDAL_DRIVER_PATH to a list of directories that
|
9 |
+
pdal should search for plugins.
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/use-vcpkg-boost.patch
ADDED
@@ -0,0 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 83a396b..7ebcc3b 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -67,7 +67,8 @@ else()
|
6 |
+
endif()
|
7 |
+
set(PDAL_LIB_NAME pdalcpp)
|
8 |
+
set(PDAL_UTIL_LIB_NAME pdal_util)
|
9 |
+
-set(PDAL_BOOST_LIB_NAME pdal_boost)
|
10 |
+
+find_package(Boost COMPONENTS filesystem system REQUIRED)
|
11 |
+
+set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system)
|
12 |
+
set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan)
|
13 |
+
set(PDAL_TEST_SUPPORT_OBJS pdal_test_support)
|
14 |
+
|
15 |
+
@@ -179,13 +180,11 @@ endif()
|
16 |
+
|
17 |
+
add_subdirectory(plugins)
|
18 |
+
|
19 |
+
-#include_directories(vendor/pdalboost)
|
20 |
+
if (WITH_TESTS)
|
21 |
+
include (${PDAL_CMAKE_DIR}/gtest.cmake)
|
22 |
+
add_subdirectory(test)
|
23 |
+
endif()
|
24 |
+
add_subdirectory(dimbuilder)
|
25 |
+
-add_subdirectory(vendor/pdalboost)
|
26 |
+
add_subdirectory(vendor/arbiter)
|
27 |
+
add_subdirectory(vendor/kazhdan)
|
28 |
+
add_subdirectory(pdal/util)
|
29 |
+
@@ -269,7 +268,6 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
|
30 |
+
${PROJECT_BINARY_DIR}/include
|
31 |
+
${PDAL_VENDOR_DIR}
|
32 |
+
${PDAL_VENDOR_DIR}/eigen
|
33 |
+
- ${PDAL_VENDOR_DIR}/pdalboost
|
34 |
+
${LIBXML2_INCLUDE_DIR}
|
35 |
+
${ZSTD_INCLUDE_DIRS}
|
36 |
+
${NLOHMANN_INCLUDE_DIR}
|
37 |
+
diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt
|
38 |
+
index 6b3e889..8a42122 100644
|
39 |
+
--- a/pdal/util/CMakeLists.txt
|
40 |
+
+++ b/pdal/util/CMakeLists.txt
|
41 |
+
@@ -40,8 +40,6 @@ target_link_libraries(${PDAL_UTIL_LIB_NAME}
|
42 |
+
${CMAKE_DL_LIBS}
|
43 |
+
${CMAKE_THREAD_LIBS_INIT}
|
44 |
+
)
|
45 |
+
-target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE
|
46 |
+
- ${PDAL_VENDOR_DIR}/pdalboost)
|
47 |
+
|
48 |
+
set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
|
49 |
+
VERSION "${PDAL_BUILD_VERSION}"
|
50 |
+
diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp
|
51 |
+
index ee47b55..4a57268 100644
|
52 |
+
--- a/pdal/util/FileUtils.cpp
|
53 |
+
+++ b/pdal/util/FileUtils.cpp
|
54 |
+
@@ -98,6 +98,12 @@ inline std::string const& toNative(std::string const& in) { return in; }
|
55 |
+
|
56 |
+
} // unnamed namespace
|
57 |
+
|
58 |
+
+namespace pdalboost
|
59 |
+
+{
|
60 |
+
+ namespace filesystem = boost::filesystem;
|
61 |
+
+ namespace system = boost::system;
|
62 |
+
+}
|
63 |
+
+
|
64 |
+
namespace FileUtils
|
65 |
+
{
|
66 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdal/vcpkg.json
ADDED
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pdal",
|
3 |
+
"version": "2.3.0",
|
4 |
+
"description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
|
5 |
+
"homepage": "https://pdal.io/",
|
6 |
+
"supports": "!(windows & staticcrt)",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-filesystem",
|
9 |
+
"boost-system",
|
10 |
+
{
|
11 |
+
"name": "curl",
|
12 |
+
"default-features": false
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "gdal",
|
16 |
+
"default-features": false
|
17 |
+
},
|
18 |
+
"libgeotiff",
|
19 |
+
"libxml2",
|
20 |
+
{
|
21 |
+
"name": "vcpkg-cmake",
|
22 |
+
"host": true
|
23 |
+
},
|
24 |
+
{
|
25 |
+
"name": "vcpkg-cmake-config",
|
26 |
+
"host": true
|
27 |
+
}
|
28 |
+
],
|
29 |
+
"default-features": [
|
30 |
+
"laszip",
|
31 |
+
"supported-plugins"
|
32 |
+
],
|
33 |
+
"features": {
|
34 |
+
"draco": {
|
35 |
+
"description": "Build the Draco plugin",
|
36 |
+
"dependencies": [
|
37 |
+
"draco"
|
38 |
+
]
|
39 |
+
},
|
40 |
+
"e57": {
|
41 |
+
"description": "Build the E57 plugin",
|
42 |
+
"dependencies": [
|
43 |
+
"xerces-c"
|
44 |
+
]
|
45 |
+
},
|
46 |
+
"hdf": {
|
47 |
+
"description": "Build the HDF plugin",
|
48 |
+
"dependencies": [
|
49 |
+
{
|
50 |
+
"name": "hdf5",
|
51 |
+
"default-features": false
|
52 |
+
}
|
53 |
+
]
|
54 |
+
},
|
55 |
+
"i3s": {
|
56 |
+
"description": "Build the SLPK/I3S plugins",
|
57 |
+
"dependencies": [
|
58 |
+
"zlib"
|
59 |
+
]
|
60 |
+
},
|
61 |
+
"laszip": {
|
62 |
+
"description": "LASzip support",
|
63 |
+
"dependencies": [
|
64 |
+
"laszip"
|
65 |
+
]
|
66 |
+
},
|
67 |
+
"liblzma": {
|
68 |
+
"description": "Support for compression/decompression with LZMA",
|
69 |
+
"dependencies": [
|
70 |
+
"liblzma"
|
71 |
+
]
|
72 |
+
},
|
73 |
+
"pgpointcloud": {
|
74 |
+
"description": "Build the PgPointCloud plugin",
|
75 |
+
"dependencies": [
|
76 |
+
"libpq"
|
77 |
+
]
|
78 |
+
},
|
79 |
+
"supported-plugins": {
|
80 |
+
"description": "Default set of plugins, dependent on platform",
|
81 |
+
"dependencies": [
|
82 |
+
{
|
83 |
+
"name": "pdal",
|
84 |
+
"default-features": false,
|
85 |
+
"features": [
|
86 |
+
"draco",
|
87 |
+
"e57",
|
88 |
+
"i3s"
|
89 |
+
]
|
90 |
+
},
|
91 |
+
{
|
92 |
+
"name": "pdal",
|
93 |
+
"default-features": false,
|
94 |
+
"features": [
|
95 |
+
"hdf",
|
96 |
+
"pgpointcloud"
|
97 |
+
],
|
98 |
+
"platform": "!uwp"
|
99 |
+
}
|
100 |
+
]
|
101 |
+
},
|
102 |
+
"zstd": {
|
103 |
+
"description": "Support for ZSTD compression/decompression",
|
104 |
+
"dependencies": [
|
105 |
+
"zstd"
|
106 |
+
]
|
107 |
+
}
|
108 |
+
}
|
109 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/LICENSE
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The core package is in the public domain, but small portions of PDCurses are subject to copyright under various licenses.
|
2 |
+
|
3 |
+
The win32 files are released to the public domain.
|
4 |
+
|
5 |
+
If you use PDCurses in an application, an acknowledgement would be appreciated, but is not mandatory. If you make corrections or enhancements to PDCurses, please forward them to the current maintainer for the benefit of other users.
|
6 |
+
|
7 |
+
This software is provided AS IS with NO WARRANTY whatsoever.
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/nmake-install.patch
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/wincon/Makefile.vc b/wincon/Makefile.vc
|
2 |
+
index 80c4689..1bae388 100644
|
3 |
+
--- a/wincon/Makefile.vc
|
4 |
+
+++ b/wincon/Makefile.vc
|
5 |
+
@@ -118,3 +118,16 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h
|
6 |
+
|
7 |
+
tuidemo.obj: $(demodir)\tuidemo.c
|
8 |
+
$(BUILD) -I$(demodir) $(demodir)\tuidemo.c
|
9 |
+
+
|
10 |
+
+install: all
|
11 |
+
+ -mkdir $(INSTALLDIR)\lib
|
12 |
+
+ copy pdcurses.lib $(INSTALLDIR)\lib
|
13 |
+
+!ifdef DLL
|
14 |
+
+ -mkdir $(INSTALLDIR)\bin
|
15 |
+
+ copy pdcurses.dll $(INSTALLDIR)\bin
|
16 |
+
+!endif
|
17 |
+
+!ifndef SKIP_HEADERS
|
18 |
+
+ -mkdir $(INSTALLDIR)\include
|
19 |
+
+ copy $(PDCURSES_SRCDIR)\curses.h $(INSTALLDIR)\include
|
20 |
+
+ copy $(PDCURSES_SRCDIR)\panel.h $(INSTALLDIR)\include
|
21 |
+
+!endif
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/portfile.cmake
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO wmcbrine/PDCurses
|
4 |
+
REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9
|
5 |
+
SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
nmake-install.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
12 |
+
cmake_path(NATIVE_PATH SOURCE_PATH PDCURSES_SRCDIR)
|
13 |
+
set(DLL_OPTION "")
|
14 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
15 |
+
set(DLL_OPTION DLL=Y)
|
16 |
+
endif()
|
17 |
+
vcpkg_build_nmake(
|
18 |
+
SOURCE_PATH "${SOURCE_PATH}/wincon"
|
19 |
+
PROJECT_NAME Makefile.vc
|
20 |
+
ENABLE_INSTALL
|
21 |
+
OPTIONS
|
22 |
+
/A
|
23 |
+
"PDCURSES_SRCDIR=${PDCURSES_SRCDIR}"
|
24 |
+
WIDE=Y
|
25 |
+
UTF8=Y
|
26 |
+
${DLL_OPTION}
|
27 |
+
OPTIONS_RELEASE
|
28 |
+
"CFLAGS=-D_CRT_SECURE_NO_WARNINGS"
|
29 |
+
"LDFLAGS="
|
30 |
+
OPTIONS_DEBUG
|
31 |
+
"CFLAGS=-D_CRT_SECURE_NO_WARNINGS -DPDCDEBUG"
|
32 |
+
"LDFLAGS=-debug"
|
33 |
+
DEBUG=Y
|
34 |
+
SKIP_HEADERS=Y
|
35 |
+
)
|
36 |
+
vcpkg_copy_pdbs()
|
37 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
38 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curses.h" "#ifdef PDC_DLL_BUILD" "#if 1")
|
39 |
+
endif()
|
40 |
+
endif()
|
41 |
+
|
42 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdcurses/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pdcurses",
|
3 |
+
"version-string": "3.9",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.",
|
6 |
+
"homepage": "https://pdcurses.org/",
|
7 |
+
"supports": "windows & !uwp & !mingw"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdqsort/portfile.cmake
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO orlp/pdqsort
|
4 |
+
REF 08879029ab8dcb80a70142acb709e3df02de5d37
|
5 |
+
SHA512 38e8b6e35edf1e88e26850a13ce892d8adc0d3e1d7954287d024b3bb858a6b2284e25fbf7c92a694b3ec77cacaf6bbc27fc365187115f7cca6bc88088f67a18f
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
file(COPY ${SOURCE_PATH}/pdqsort.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/pdqsort)
|
10 |
+
|
11 |
+
# Handle copyright
|
12 |
+
file(COPY ${SOURCE_PATH}/license.txt ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdqsort)
|
13 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/share/pdqsort/license.txt ${CURRENT_PACKAGES_DIR}/share/pdqsort/copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pdqsort/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pdqsort",
|
3 |
+
"version-string": "2019-07-30",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm",
|
6 |
+
"homepage": "https://github.com/orlp/pdqsort"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/arm64-windows-fix.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
find_package(Filesystem) fails on arm64 Windows.
|
2 |
+
We can remove it as it is only used for tests which are not built in vcpkg.
|
3 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
4 |
+
--- a/CMakeLists.txt
|
5 |
+
+++ b/CMakeLists.txt
|
6 |
+
@@ -15,7 +15,6 @@ endif ()
|
7 |
+
include(cmake/compilation_flags.cmake)
|
8 |
+
# Greater c++17 filesystem compatibility (like with experimental)
|
9 |
+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
|
10 |
+
-find_package(Filesystem COMPONENTS Experimental Final REQUIRED)
|
11 |
+
list(APPEND GLOBAL_CXXFLAGS ${DEFAULT_CXX_FLAGS})
|
12 |
+
|
13 |
+
option(BUILD_SHARED_LIBS "Build Shared Libraries" ON)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/portfile.cmake
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO trailofbits/pe-parse
|
4 |
+
REF v1.3.0
|
5 |
+
SHA512 b723e90821e0ac67b4d6b15e5a46cf13544f21380a4d2add013eedcaa309e1be2cff6789247397c6fb4a938e4a240a835cbe21c8221bd558a4fccf8e93ce1548
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
arm64-windows-fix.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
OPTIONS
|
14 |
+
-DBUILD_COMMAND_LINE_TOOLS=OFF
|
15 |
+
)
|
16 |
+
|
17 |
+
vcpkg_cmake_install()
|
18 |
+
|
19 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pe-parse")
|
20 |
+
|
21 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
22 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
23 |
+
|
24 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pe-parse/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pe-parse",
|
3 |
+
"version": "1.3.0",
|
4 |
+
"description": "pe-parse is a principled, lightweight C/C++ PE parser",
|
5 |
+
"homepage": "https://github.com/trailofbits/pe-parse",
|
6 |
+
"supports": "!uwp",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pegtl/portfile.cmake
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO taocpp/pegtl
|
4 |
+
REF 3.2.5
|
5 |
+
SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
|
6 |
+
HEAD_REF main
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
OPTIONS
|
12 |
+
-DPEGTL_BUILD_TESTS=OFF
|
13 |
+
-DPEGTL_BUILD_EXAMPLES=OFF
|
14 |
+
-DPEGTL_INSTALL_DOC_DIR=share/pegtl
|
15 |
+
-DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_install()
|
19 |
+
|
20 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake)
|
21 |
+
|
22 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
23 |
+
|
24 |
+
# Handle copyright
|
25 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pegtl/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pegtl",
|
3 |
+
"version-semver": "3.2.5",
|
4 |
+
"description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).",
|
5 |
+
"homepage": "https://github.com/taocpp/PEGTL",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|