[pcl] Support boost 1.68

This commit is contained in:
Robert Schumacher 2018-08-17 10:28:38 -07:00
parent b901286329
commit b3b034d33a
3 changed files with 24 additions and 14 deletions

View File

@ -1,5 +1,5 @@
Source: pcl
Version: 1.8.1-10
Version: 1.8.1-11
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

View File

@ -6,19 +6,16 @@ vcpkg_from_github(
REF pcl-1.8.1
SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/cmakelists.patch"
"${CMAKE_CURRENT_LIST_DIR}/config.patch"
"${CMAKE_CURRENT_LIST_DIR}/config_install.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_flann.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_qhull.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_openni2.patch"
"${CMAKE_CURRENT_LIST_DIR}/find_cuda.patch"
"${CMAKE_CURRENT_LIST_DIR}/vs2017-15.4-workaround.patch"
"${CMAKE_CURRENT_LIST_DIR}/boost_uuid_random_generator_compat.patch"
PATCHES cmakelists.patch
config.patch
config_install.patch
find_flann.patch
find_qhull.patch
find_openni2.patch
find_cuda.patch
vs2017-15.4-workaround.patch
boost_uuid_random_generator_compat.patch
uuid-detail-sha1.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)

View File

@ -0,0 +1,13 @@
diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
index 5b12331..b83f320 100644
--- a/visualization/src/pcl_visualizer.cpp
+++ b/visualization/src/pcl_visualizer.cpp
@@ -100,7 +100,7 @@
#include <pcl/visualization/pcl_visualizer.h>
#include <pcl/visualization/common/common.h>
#include <pcl/common/time.h>
-#include <boost/uuid/sha1.hpp>
+#include <boost/uuid/detail/sha1.hpp>
#include <boost/filesystem.hpp>
#include <pcl/console/parse.h>