2024-03-29 04:21:54 +08:00
|
|
|
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
|
|
|
|
|
index cf21c44..4076775 100644
|
|
|
|
|
--- a/PCLConfig.cmake.in
|
|
|
|
|
+++ b/PCLConfig.cmake.in
|
|
|
|
|
@@ -460,6 +460,11 @@ list(LENGTH pcl_all_components PCL_NB_COMPONENTS)
|
|
|
|
|
|
|
|
|
|
@PCLCONFIG_OPTIONAL_DEPENDENCIES@
|
|
|
|
|
|
|
|
|
|
+# io_ply subcomponent
|
|
|
|
|
+list(APPEND pcl_io_int_dep io_ply)
|
|
|
|
|
+set(pcl_io_ply_int_dep common)
|
|
|
|
|
+set(pcl_io_ply_ext_dep boost)
|
|
|
|
|
+
|
|
|
|
|
# VTK components required by PCL
|
|
|
|
|
set(PCL_VTK_COMPONENTS "@PCL_VTK_COMPONENTS@")
|
|
|
|
|
|
|
|
|
|
@@ -517,18 +522,21 @@ foreach(component ${PCL_TO_FIND_COMPONENTS})
|
|
|
|
|
|
|
|
|
|
string(REGEX REPLACE "^cuda_(.*)$" "\\1" cuda_component "${component}")
|
|
|
|
|
string(REGEX REPLACE "^gpu_(.*)$" "\\1" gpu_component "${component}")
|
|
|
|
|
+ string(REGEX REPLACE "^io_(.*)$" "\\1" io_component "${component}")
|
|
|
|
|
|
|
|
|
|
find_path(PCL_${COMPONENT}_INCLUDE_DIR
|
|
|
|
|
NAMES pcl/${component}
|
|
|
|
|
pcl/apps/${component}
|
|
|
|
|
pcl/cuda/${cuda_component} pcl/cuda/${component}
|
|
|
|
|
pcl/gpu/${gpu_component} pcl/gpu/${component}
|
|
|
|
|
+ pcl/io/${io_component}
|
|
|
|
|
HINTS ${PCL_INCLUDE_DIRS}
|
|
|
|
|
PATH_SUFFIXES
|
|
|
|
|
${component}/include
|
|
|
|
|
apps/${component}/include
|
|
|
|
|
cuda/${cuda_component}/include
|
|
|
|
|
gpu/${gpu_component}/include
|
|
|
|
|
+ io/${io_component}/include
|
|
|
|
|
DOC "path to ${component} headers"
|
|
|
|
|
NO_DEFAULT_PATH)
|
|
|
|
|
mark_as_advanced(PCL_${COMPONENT}_INCLUDE_DIR)
|
|
|
|
|
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
|
|
|
|
|
index 7fc86b2..7a39033 100644
|
|
|
|
|
--- a/io/CMakeLists.txt
|
|
|
|
|
+++ b/io/CMakeLists.txt
|
|
|
|
|
@@ -213,6 +213,8 @@ PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
|
[pcl] update to version 1.14.1 (#38553)
<!-- If your PR fixes issues, please note that here by adding "Fixes
#NNNNNN." for each fixed issue on separate lines. -->
<!-- If you are still working on the PR, open it as a Draft:
https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
Updated io_ply.patch so that it applies cleanly.
Additionally, the setting `-DWITH_OPENMP=OFF` is removed because there
does not seem to be a specific reason for it, and in my tests PCL still
built fine if it was removed, see
https://github.com/microsoft/vcpkg/pull/21276#issuecomment-2044492937
<!-- If this PR adds a new port, please uncomment and fill out this
checklist:
- [ ] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] The name of the port matches an existing name for this component
on https://repology.org/ if possible, and/or is strongly associated with
that component on search engines.
- [ ] Optional dependencies are resolved in exactly one way. For
example, if the component is built with CMake, all `find_package` calls
are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or
disabled with
[CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
- [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
- [ ] The license declaration in `vcpkg.json` matches what upstream
says.
- [ ] The installed as the "copyright" file matches what upstream says.
- [ ] The source code of the component installed comes from an
authoritative source.
- [ ] The generated "usage text" is accurate. See
[adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md)
for context.
- [ ] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [ ] Only one version is in the new port's versions file.
- [ ] Only one version is added to each modified port's versions file.
END OF NEW PORT CHECKLIST (delete this line) -->
2024-05-04 06:29:44 +08:00
|
|
|
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/ply" ${PLY_INCLUDES})
|
2024-03-29 04:21:54 +08:00
|
|
|
target_link_libraries(pcl_io_ply pcl_common Boost::boost)
|
|
|
|
|
|
|
|
|
|
+PCL_MAKE_PKGCONFIG(pcl_io_ply COMPONENT ${SUBSYS_NAME} DESC "${SUBSYS_DESC}, PLY" PCL_DEPS common)
|
|
|
|
|
+
|
|
|
|
|
set(srcs
|
|
|
|
|
src/debayer.cpp
|
|
|
|
|
src/pcd_grabber.cpp
|
|
|
|
|
@@ -432,7 +434,7 @@ if(WITH_ENSENSO)
|
|
|
|
|
list(APPEND EXT_DEPS ensenso)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} EXT_DEPS ${EXT_DEPS})
|
|
|
|
|
+PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} EXT_DEPS ${EXT_DEPS} pcl_io_ply)
|
|
|
|
|
|
|
|
|
|
# Install include files
|
|
|
|
|
PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
|