diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 11:54:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 11:54:28 +0000 |
| commit | e6918187568dbd01842d8d1d2c808ce16a894239 (patch) | |
| tree | 64f88b554b444a49f656b6c656111a145cbbaa28 /src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch | |
| parent | Initial commit. (diff) | |
| download | ceph-e6918187568dbd01842d8d1d2c808ce16a894239.tar.xz ceph-e6918187568dbd01842d8d1d2c808ce16a894239.zip | |
Adding upstream version 18.2.2.upstream/18.2.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch')
| -rw-r--r-- | src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch b/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch new file mode 100644 index 000000000..3aad7af32 --- /dev/null +++ b/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/pdal/0003-fix-copy-vendor.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43e446a..c4c7d6f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -339,6 +339,30 @@ install(DIRECTORY ${PDAL_FILTERS_DIR}
+ install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp}
+ DESTINATION include/pdal
+ )
++# Install vendor headers
++install(DIRECTORY ${PDAL_VENDOR_ARBITER_DIR}
++ DESTINATION include/pdal/vendor
++ FILES_MATCHING PATTERN "*.hpp"
++ PATTERN "private" EXCLUDE
++)
++
++install(DIRECTORY ${PDAL_VENDOR_JSONCPP_DIR}
++ DESTINATION include/pdal/vendor
++ FILES_MATCHING PATTERN "*.h"
++ PATTERN "private" EXCLUDE
++)
++
++install(DIRECTORY ${PDAL_VENDOR_KAZHDAN_DIR}
++ DESTINATION include/pdal/vendor
++ FILES_MATCHING PATTERN "*.h"
++ PATTERN "private" EXCLUDE
++)
++
++install(DIRECTORY ${PDAL_VENDOR_NANOFLANN_DIR}
++ DESTINATION include/pdal/vendor
++ FILES_MATCHING PATTERN "*.hpp"
++ PATTERN "private" EXCLUDE
++)
+
+ #
+ # CPACK
+@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+ export(
+ TARGETS
+- ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
++ ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
+ FILE
+ "${PDAL_BINARY_DIR}/PDALTargets.cmake")
+
+diff --git a/cmake/directories.cmake b/cmake/directories.cmake
+index f079ec7..8e366e8 100644
+--- a/cmake/directories.cmake
++++ b/cmake/directories.cmake
+@@ -11,4 +11,7 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels)
+ set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters)
+ set(PDAL_IO_DIR ${ROOT_DIR}/io)
+ set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor)
+-
++set(PDAL_VENDOR_ARBITER_DIR ${PDAL_VENDOR_DIR}/arbiter)
++set(PDAL_VENDOR_JSONCPP_DIR ${PDAL_VENDOR_DIR}/jsoncpp)
++set(PDAL_VENDOR_KAZHDAN_DIR ${PDAL_VENDOR_DIR}/kazhdan)
++set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann)
+
+\ No newline at end of file
|