* update patches

* Fix version database

* remove old patch

Co-authored-by: Billy O'Neal <bion@microsoft.com>
This commit is contained in:
Javier Matos Denizac 2022-11-09 11:13:27 -08:00 коммит произвёл GitHub
Родитель e9ffd9892f
Коммит 124cf373b4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 33 добавлений и 18 удалений

Просмотреть файл

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1d9bb5..73b1465 100644
index a1d9bb5..bf64c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,10 +359,8 @@ if(WITH_QHULL)
@ -10,30 +10,40 @@ index a1d9bb5..73b1465 100644
- if(QHULL_FOUND)
- include_directories(SYSTEM ${QHULL_INCLUDE_DIRS})
- endif()
+ find_package(Qhull CONFIG REQUIRED)
+ find_package(QHULL NAMES Qhull CONFIG REQUIRED)
+ set(HAVE_QHULL ON)
endif()
# Cuda
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
index a1283a8..32f95b3 100644
--- a/PCLConfig.cmake.in
+++ b/PCLConfig.cmake.in
@@ -26,6 +26,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules")
+include(CMakeFindDependencyMacro)
### ---[ some useful macros
macro(pcl_report_not_found _reason)
unset(PCL_FOUND)
@@ -136,7 +137,7 @@ macro(find_qhull)
endif()
set(QHULL_USE_STATIC @QHULL_USE_STATIC@)
- find_package(Qhull)
+ find_dependency(QHULL NAMES Qhull CONFIG)
endmacro()
#remove this as soon as libopenni is shipped with FindOpenni.cmake
diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt
index d8a8566..1953c55 100644
index d8a8566..a629b2a 100644
--- a/surface/CMakeLists.txt
+++ b/surface/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT build)
return()
@@ -187,6 +187,11 @@ if(VTK_FOUND)
endif()
-if(QHULL_FOUND)
+if(Qhull_FOUND)
set(HULL_INCLUDES
"include/pcl/${SUBSYS_NAME}/concave_hull.h"
"include/pcl/${SUBSYS_NAME}/convex_hull.h"
@@ -186,7 +186,12 @@ if(VTK_FOUND)
endif()
endif()
-if(QHULL_FOUND)
+if(Qhull_FOUND)
if(QHULL_FOUND)
+ if(QHULL_USE_STATIC)
+ set(QHULL_LIBRARIES Qhull::qhullcpp Qhull::qhullstatic Qhull::qhullstatic_r)
+ else()

Просмотреть файл

@ -1,7 +1,7 @@
{
"name": "pcl",
"version": "1.12.0",
"port-version": 6,
"port-version": 7,
"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",

Просмотреть файл

@ -5674,7 +5674,7 @@
},
"pcl": {
"baseline": "1.12.0",
"port-version": 6
"port-version": 7
},
"pcre": {
"baseline": "8.45",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aec81fe0832359b4fea5929da4e34af33f116baa",
"version": "1.12.0",
"port-version": 7
},
{
"git-tree": "af82798f0369372866e38d58f1e38a1165801c1d",
"version": "1.12.0",