diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-02-05 05:35:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 13:35:20 -0800 |
| commit | 05392981d355f8c46fba32b21f33eeb46a8666f0 (patch) | |
| tree | 5851480b48feb72da7bdc4b49954a5fa84a35cea | |
| parent | aa60b7efa56a83ead743718941d8b320ef4a05af (diff) | |
| download | vcpkg-05392981d355f8c46fba32b21f33eeb46a8666f0.tar.gz vcpkg-05392981d355f8c46fba32b21f33eeb46a8666f0.zip | |
[pcl] Add gcc version check (#9231)
* [pcl] Add compile options on unix platform
* Add versions
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
| -rw-r--r-- | ports/pcl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pcl/add-gcc-version-check.patch | 15 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/pcl.json | 5 |
5 files changed, 23 insertions, 2 deletions
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 459015901..5954613bb 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,6 +1,6 @@ Source: pcl Version: 1.11.1 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/PointCloudLibrary/pcl Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, 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-sort, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio diff --git a/ports/pcl/add-gcc-version-check.patch b/ports/pcl/add-gcc-version-check.patch new file mode 100644 index 000000000..dbef34b63 --- /dev/null +++ b/ports/pcl/add-gcc-version-check.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c452ce..2c50b8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,6 +303,10 @@ set(FLANN_USE_STATIC ON) + find_package(FLANN 1.7.0 REQUIRED) + find_package(lz4) + ++if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) ++ set (CMAKE_CXX_STANDARD 17) ++endif() ++ + # libusb-1.0 + option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE) + if(WITH_LIBUSB) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 6fe027ce9..92fb2e41b 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( remove-broken-targets.patch fix-check-sse.patch realsense2.patch + add-gcc-version-check.patch ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) diff --git a/versions/baseline.json b/versions/baseline.json index 8ef915f17..9dc8cf6de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4494,7 +4494,7 @@ }, "pcl": { "baseline": "1.11.1", - "port-version": 1 + "port-version": 2 }, "pcre": { "baseline": "8.44", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 9c098e49b..540bbbf7b 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7efe6bc9f411b5669ec8ae76407a1250318f3772", + "version-string": "1.11.1", + "port-version": 2 + }, + { "git-tree": "ec0a23d0b9414a2df0dffcf2ae613bd4e99c35b1", "version-string": "1.11.1", "port-version": 1 |