Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pcl] Re-fix feature visualization, fix use qhull #22995

Merged
merged 4 commits into from
Feb 10, 2022
Merged

[pcl] Re-fix feature visualization, fix use qhull #22995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aed3d54
[pcl] Re-fix feature visualization, fix use qhull
Feb 8, 2022
21b9d27
version
Feb 8, 2022
ef70e24
Add license field
Feb 8, 2022
5536c87
version
Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions ports/pcl/fix-find-qhull.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
From 7e3117fb47f58c7b1fb83e3a062a630b787a43bc Mon Sep 17 00:00:00 2001
From: raahilsha-z <[email protected]>
Date: Wed, 7 Jul 2021 16:11:12 -0400
Subject: [PATCH] fix find qhull

---
CMakeLists.txt | 5 +----
surface/CMakeLists.txt | 9 +++++++--
2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1d9bb58f..7cf86f74b 100644
index a1d9bb5..73b1465 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,10 +359,7 @@ if(WITH_QHULL)
@@ -359,10 +359,8 @@ if(WITH_QHULL)
if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32))
set(QHULL_USE_STATIC ON)
endif()
Expand All @@ -21,11 +11,12 @@ index a1d9bb58f..7cf86f74b 100644
- include_directories(SYSTEM ${QHULL_INCLUDE_DIRS})
- endif()
+ find_package(Qhull CONFIG REQUIRED)
+ set(HAVE_QHULL ON)
endif()

# Cuda
diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
index d8a8566ea..1953c5566 100644
index d8a8566..1953c55 100644
--- a/surface/CMakeLists.txt
+++ b/surface/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT build)
Expand All @@ -51,6 +42,3 @@ index d8a8566ea..1953c5566 100644
target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES})
endif()

--
2.32.0.windows.1

5 changes: 1 addition & 4 deletions ports/pcl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
cuda BUILD_GPU
tools BUILD_tools
opengl WITH_OPENGL
vtk WITH_VTK
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
libusb WITH_LIBUSB
visualization WITH_VTK
visualization BUILD_visualization
examples BUILD_examples
apps BUILD_apps
apps BUILD_apps_cloud_composer
apps BUILD_apps_modeler
apps BUILD_apps_point_cloud_editor
Comment on lines -50 to -52
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 3 options are not exist.

# These 2 apps need openni1
#apps BUILD_apps_in_hand_scanner
#apps BUILD_apps_3d_rec_framework
Expand Down
3 changes: 2 additions & 1 deletion ports/pcl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "pcl",
"version": "1.12.0",
"port-version": 3,
"port-version": 4,
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
"homepage": "https://github.com/PointCloudLibrary/pcl",
"license": "BSD-3-Clause",
"supports": "!(arm64 & windows)",
"dependencies": [
"boost-asio",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5238,7 +5238,7 @@
},
"pcl": {
"baseline": "1.12.0",
"port-version": 3
"port-version": 4
},
"pcre": {
"baseline": "8.45",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7e54ab86574dfc901275996e282f8db5c6c9c3fb",
"version": "1.12.0",
"port-version": 4
},
{
"git-tree": "0f0c24ef83692fbcc9434ec9622592ba9b16e0d5",
"version": "1.12.0",
Expand Down