3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[pcl] Update to PCL 1.9.1 (#4842)

Browse Source 
Update PCL port to PCL 1.9.1.
This commit is contained in:
Tsukasa Sugiura 2018-11-29 11:20:09 +09:00 committed by Robert Schumacher
parent 08d6a49977
commit 3e71750029
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/pcl/CONTROL
View File

@ -1,5 +1,5 @@
Source: pcl
Version: 1.9.0-1
Version: 1.9.1-1
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio

36
ports/pcl/pcl_utils.patch
View File

@ -1,22 +1,28 @@
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
index 41a64a269..a12718339 100644
index f523dbc8c..a171b6d24 100644
--- a/cmake/pcl_utils.cmake
+++ b/cmake/pcl_utils.cmake
@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
if (NOT DEFINED LIB_INSTALL_DIR)
set(LIB_INSTALL_DIR "lib")
endif (NOT DEFINED LIB_INSTALL_DIR)
if(NOT ANDROID)
set(INCLUDE_INSTALL_ROOT
- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
+ "include")
else(NOT ANDROID)
set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
endif(NOT ANDROID)
@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS)
- if(NOT ANDROID)
- set(INCLUDE_INSTALL_ROOT
- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
- else(NOT ANDROID)
- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
- endif(NOT ANDROID)
+ set(INCLUDE_INSTALL_ROOT "include")
set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
set(BIN_INSTALL_DIR "bin")
set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
if(WIN32 AND NOT MINGW)
- if(WIN32 AND NOT MINGW)
- set(PCLCONFIG_INSTALL_DIR "cmake")
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
else(WIN32 AND NOT MINGW)
set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
endif(WIN32 AND NOT MINGW)
- else(WIN32 AND NOT MINGW)
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
- endif(WIN32 AND NOT MINGW)
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
endmacro(SET_INSTALL_DIRS)

4
ports/pcl/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PointCloudLibrary/pcl
REF pcl-1.9.0
SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
REF pcl-1.9.1
SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
HEAD_REF master
PATCHES pcl_utils.patch
pcl_config.patch