The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[pdal]fix missing vendor headers (#5846)

Browse Source 
* [pdal]1.fix missing vendor headers.   2.modify the patch name and add the serial number.
This commit is contained in:
JackBoosY 2019-03-30 14:28:53 +08:00 committed by Phil Christensen
parent f5c04ea6b4
commit 5a9b14c978
4 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ports/pdal/no-source-dir-writes.patch → ports/pdal/0002-no-source-dir-writes.patch
View File

50
ports/pdal/0003-fix-copy-vendor.patch Normal file
View File

@ -0,0 +1,50 @@
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
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

2
ports/pdal/CONTROL
View File

@ -1,4 +1,4 @@
Source: pdal Source: pdal
Version: 1.7.1-3 Version: 1.7.1-4
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data. Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip

12
ports/pdal/portfile.cmake
View File

@ -2,7 +2,6 @@
# #
# NOTE: update the version string for new PDAL release # NOTE: update the version string for new PDAL release
set(PDAL_VERSION_STR "1.7.1") set(PDAL_VERSION_STR "1.7.1")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/PDAL-${PDAL_VERSION_STR}-src)
include(vcpkg_common_functions) include(vcpkg_common_functions)
@ -11,13 +10,14 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz" FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz"
SHA512 e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 SHA512 e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_extract_source_archive_ex(
SOURCE_PATH ${SOURCE_PATH} ARCHIVE ${ARCHIVE}
OUT_SOURCE_PATH SOURCE_PATH
PATCHES PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001-win32_compiler_options.cmake.patch 0001-win32_compiler_options.cmake.patch
${CMAKE_CURRENT_LIST_DIR}/no-source-dir-writes.patch 0002-no-source-dir-writes.patch
0003-fix-copy-vendor.patch
) )
file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")