diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-08-17 10:28:38 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-20 14:26:47 -0700 |
| commit | b3b034d33acf6a991f9b9f290a666678e345b3f0 (patch) | |
| tree | 57b710f4d621b3f5bdf0bc4fe96c042b6ac577e4 | |
| parent | b9012863292f1e4b431d1f02a3bbc1457c17690d (diff) | |
| download | vcpkg-b3b034d33acf6a991f9b9f290a666678e345b3f0.tar.gz vcpkg-b3b034d33acf6a991f9b9f290a666678e345b3f0.zip | |
[pcl] Support boost 1.68
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 23 | ||||
| -rw-r--r-- | ports/pcl/uuid-detail-sha1.patch | 13 |
3 files changed, 24 insertions, 14 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 82f5cdea3..a9f0186fb 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -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 diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 12c9ec398..a3b65ebac 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -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) diff --git a/ports/pcl/uuid-detail-sha1.patch b/ports/pcl/uuid-detail-sha1.patch new file mode 100644 index 000000000..8c2536cab --- /dev/null +++ b/ports/pcl/uuid-detail-sha1.patch @@ -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>
+
|