From 8c54a4531c12f2ce485f88b8afcd30023e622665 Mon Sep 17 00:00:00 2001 From: Andre Nguyen Date: Thu, 22 Aug 2024 05:50:45 -0400 Subject: [PATCH] [small-gicp] Update to version 1.0.0 (#40542) --- ports/small-gicp/portfile.cmake | 8 +++++--- ports/small-gicp/preprocessor_portability.patch | 13 +++++++++++++ ports/small-gicp/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/s-/small-gicp.json | 5 +++++ 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 ports/small-gicp/preprocessor_portability.patch diff --git a/ports/small-gicp/portfile.cmake b/ports/small-gicp/portfile.cmake index 868cc64fe4..ccb445cbe0 100644 --- a/ports/small-gicp/portfile.cmake +++ b/ports/small-gicp/portfile.cmake @@ -2,14 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO koide3/small_gicp REF "v${VERSION}" - SHA512 78fda568981cdbb37e62b5e6dddae028e515abbfd3cc8ae6f6d57f10b5166eac66a628de12fed124cebcc1243fb6d083cb9b0bf105655a422a6733747313114f + SHA512 b4d4b662d74b5492b7b89bcaf022e2d90262eecd3f1b6d3229edefbb00288a95910d486e66a9e884528f6f9c253a5e535ce7f96829fdc760f58ac001f6192790 HEAD_REF master + PATCHES preprocessor_portability.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - pcl BUILD_WITH_PCL - tbb BUILD_WITH_TBB + pcl BUILD_WITH_PCL + tbb BUILD_WITH_TBB + openmp BUILD_WITH_OPENMP ) vcpkg_cmake_configure( diff --git a/ports/small-gicp/preprocessor_portability.patch b/ports/small-gicp/preprocessor_portability.patch new file mode 100644 index 0000000000..368f06a6b2 --- /dev/null +++ b/ports/small-gicp/preprocessor_portability.patch @@ -0,0 +1,13 @@ +diff --git a/include/small_gicp/registration/reduction_omp.hpp b/include/small_gicp/registration/reduction_omp.hpp +index 8c11267..7edf4a5 100644 +--- a/include/small_gicp/registration/reduction_omp.hpp ++++ b/include/small_gicp/registration/reduction_omp.hpp +@@ -7,7 +7,7 @@ + namespace small_gicp { + + #ifndef _OPENMP +-#warning "OpenMP is not available. Parallel reduction will be disabled." ++#pragma message ( "OpenMP is not available. Parallel reduction will be disabled." ) + inline int omp_get_thread_num() { + return 0; + } diff --git a/ports/small-gicp/vcpkg.json b/ports/small-gicp/vcpkg.json index 52e20e0054..c120a20473 100644 --- a/ports/small-gicp/vcpkg.json +++ b/ports/small-gicp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "small-gicp", - "version": "0.1.2", + "version": "1.0.0", "description": "Efficient and parallelized algorithms for point cloud registration", "homepage": "https://github.com/koide3/small_gicp", "license": "MIT", @@ -17,6 +17,9 @@ } ], "features": { + "openmp": { + "description": "Enable OpenMP based parallelism." + }, "pcl": { "description": "Enable interfacing with PointCloud Library.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 984c1f3231..0147c1cc0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8305,7 +8305,7 @@ "port-version": 3 }, "small-gicp": { - "baseline": "0.1.2", + "baseline": "1.0.0", "port-version": 0 }, "smf": { diff --git a/versions/s-/small-gicp.json b/versions/s-/small-gicp.json index 0eafb2bb2b..4f4e8d5b91 100644 --- a/versions/s-/small-gicp.json +++ b/versions/s-/small-gicp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "476016c83550a280e02101c7bd4d5c215c0fba7b", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "c7becadc73dd4c8b5a23a12521521ce4b636a4ea", "version": "0.1.2",