diff options
| author | yurybura <yurybura@gmail.com> | 2020-05-13 20:26:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 10:26:05 -0700 |
| commit | 24e8be5fcfddd0da98b58a63cd918849787fb06f (patch) | |
| tree | 328e0bd25684f1392419547c1b3360e06ba5845b /ports/pcl | |
| parent | 597038559647776ee39d02dcf159da05d9342f1d (diff) | |
| download | vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.tar.gz vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.zip | |
[boost] update to 1.73.0 (#11221)
* [boost] update to 1.73
* [ompl] remove dependency to boost-disjoint-sets
* [libtorrent] include fixes from RC_1_2 branch
* [liblas] fix boost headers
* [freeopcua] fix std headers
* [pcl] fix build with Boost 1.73.0
* [hpx] fix build with Boost 1.73.0
* [libmysql] fix conflict with C++20 header <version>
* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)
* [boost-python] remove Python executable from user-config
* [libtorrent] update version after merge
* [libtorrent] add boost-variant dependency
Diffstat (limited to 'ports/pcl')
| -rw-r--r-- | ports/pcl/boost-1.73.patch | 50 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/ports/pcl/boost-1.73.patch b/ports/pcl/boost-1.73.patch new file mode 100644 index 000000000..d634d84bb --- /dev/null +++ b/ports/pcl/boost-1.73.patch @@ -0,0 +1,50 @@ +diff --git a/common/include/pcl/PCLPointCloud2.h b/common/include/pcl/PCLPointCloud2.h +index 6a00c1f..5d4ac1c 100644 +--- a/common/include/pcl/PCLPointCloud2.h ++++ b/common/include/pcl/PCLPointCloud2.h +@@ -8,7 +8,7 @@ + #include <string> + #include <vector> + #include <ostream> +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + + // Include the correct Header path here + #include <pcl/PCLHeader.h> +@@ -23,9 +23,9 @@ namespace pcl + is_bigendian (false), point_step (0), row_step (0), + data (), is_dense (false) + { +-#if defined(BOOST_BIG_ENDIAN) ++#if BOOST_ENDIAN_BIG_BYTE + is_bigendian = true; +-#elif defined(BOOST_LITTLE_ENDIAN) ++#elif BOOST_ENDIAN_LITTLE_BYTE + is_bigendian = false; + #else + #error "unable to determine system endianness" +diff --git a/io/include/pcl/io/ply/byte_order.h b/io/include/pcl/io/ply/byte_order.h +index 2af95d0..8328015 100644 +--- a/io/include/pcl/io/ply/byte_order.h ++++ b/io/include/pcl/io/ply/byte_order.h +@@ -40,7 +40,7 @@ + #ifndef PCL_IO_PLY_BYTE_ORDER_H + #define PCL_IO_PLY_BYTE_ORDER_H + +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + + namespace pcl + { +@@ -58,9 +58,9 @@ namespace pcl + { + little_endian_byte_order, + big_endian_byte_order, +-#if defined(BOOST_BIG_ENDIAN) ++#if BOOST_ENDIAN_BIG_BYTE + host_byte_order = big_endian_byte_order, +-#elif defined(BOOST_LITTLE_ENDIAN) ++#elif BOOST_ENDIAN_LITTLE_BYTE + host_byte_order = little_endian_byte_order, + #else + #error "unable to determine system endianness" diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 0f4c30127..ef3cf959e 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( # Patch for https://github.com/microsoft/vcpkg/issues/7660 use_target_link_libraries_in_pclconfig.patch fix-link-libpng.patch + boost-1.73.patch ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) |