Skip to content

Commit

Permalink
[pcl] no absolute paths (microsoft#22661)
Browse files Browse the repository at this point in the history
  • Loading branch information
autoantwort authored Jan 26, 2022
1 parent e6a604d commit fb80699
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 2 deletions.
21 changes: 21 additions & 0 deletions ports/pcl/no-absolute.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
index 4137ed1..167fde2 100644
--- a/PCLConfig.cmake.in
+++ b/PCLConfig.cmake.in
@@ -230,7 +230,7 @@ macro(find_flann)
if(PCL_ALL_IN_ONE_INSTALLER)
set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann")
elseif(NOT FLANN_ROOT)
- set(FLANN_ROOT "@FLANN_ROOT@")
+ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}")
endif()

set(FLANN_USE_STATIC @FLANN_USE_STATIC@)
@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
# pcl_message("PCL found into a build tree.")
set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h
set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
else()
pcl_report_not_found("PCL can not be found on this machine")
endif()
1 change: 1 addition & 0 deletions ports/pcl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vcpkg_from_github(
fix-pkgconfig.patch # Remove this patch in the next update
fix-find-libusb.patch
install-examples.patch
no-absolute.patch
)

file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake"
Expand Down
2 changes: 1 addition & 1 deletion ports/pcl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pcl",
"version": "1.12.0",
"port-version": 2,
"port-version": 3,
"description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
"homepage": "https://github.com/PointCloudLibrary/pcl",
"supports": "!(arm64 & windows)",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5222,7 +5222,7 @@
},
"pcl": {
"baseline": "1.12.0",
"port-version": 2
"port-version": 3
},
"pcre": {
"baseline": "8.45",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0f0c24ef83692fbcc9434ec9622592ba9b16e0d5",
"version": "1.12.0",
"port-version": 3
},
{
"git-tree": "5d02740fc9422f1b520ae322cda71e8e6e5323cf",
"version": "1.12.0",
Expand Down

0 comments on commit fb80699

Please sign in to comment.