Skip to content

Commit 7cbb653

Browse files
authored
Merge pull request #275 from Ericsii/package-spatio_temporal_voxel_layer
Add spatio_temporal_voxel_layer
2 parents 5aaaf6e + 18a5e24 commit 7cbb653

5 files changed

+63
-0
lines changed

patch/dependencies.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,7 @@ zenoh_cpp_vendor:
184184
add_host: ["libzenohc", "libzenohcxx"]
185185
rmw_zenoh_cpp:
186186
add_host: ["libzenohc", "libzenohcxx"]
187+
openvdb_vendor:
188+
add_host: ["openvdb"]
189+
spatio_temporal_voxel_layer:
190+
add_host: ["REQUIRE_OPENGL"]

patch/ros-humble-openvdb-vendor.patch

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index c158a4a..8fad1d8 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -4,7 +4,11 @@ project(openvdb_vendor)
6+
find_package(ament_cmake REQUIRED)
7+
find_package(ament_cmake_vendor_package REQUIRED)
8+
9+
+list(APPEND CMAKE_MODULE_PATH "$ENV{PREFIX}/lib/cmake/OpenVDB")
10+
+find_package(OpenVDB REQUIRED)
11+
+
12+
ament_vendor(${PROJECT_NAME}
13+
+ SATISFIED ${OpenVDB_FOUND}
14+
VCS_URL https://github.com/AcademySoftwareFoundation/openvdb.git
15+
VCS_VERSION v10.0.1
16+
VCS_TYPE git
17+
diff --git a/openvdb_vendor-extras.cmake b/openvdb_vendor-extras.cmake
18+
index a32dfc5..93ce1b9 100644
19+
--- a/openvdb_vendor-extras.cmake
20+
+++ b/openvdb_vendor-extras.cmake
21+
@@ -3,5 +3,5 @@ if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
22+
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
23+
endif()
24+
message( STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
25+
-list(APPEND CMAKE_MODULE_PATH "${openvdb_vendor_DIR}/../../../opt/openvdb_vendor/lib/cmake/OpenVDB")
26+
+list(APPEND CMAKE_MODULE_PATH "$ENV{PREFIX}/lib/cmake/OpenVDB")
27+
find_package(OpenVDB REQUIRED)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index c0f52e7..378a082 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -9,9 +9,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
6+
add_compile_options(-Wall -Wextra -Wpedantic)
7+
endif()
8+
9+
-# Get a linker error when there are undefined symbols
10+
-add_link_options(-Wl,--no-undefined)
11+
-
12+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
13+
14+
find_package(ament_cmake REQUIRED)
15+
@@ -111,6 +108,15 @@ target_link_libraries(${library_name}
16+
OpenVDB::openvdb
17+
)
18+
19+
+# Get a linker error when there are undefined symbols
20+
+# target_link_options (https://cmake.org/cmake/help/latest/command/target_link_options.html)
21+
+# is only available since CMake 3.13
22+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
23+
+ target_link_options(${library_name} PRIVATE -Wl,--no-undefined)
24+
+else()
25+
+ add_link_options(-Wl,--no-undefined)
26+
+endif()
27+
+
28+
ament_target_dependencies(${library_name} ${dependencies})
29+
30+
if(BUILD_TESTING)

vinca_linux_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ skip_existing:
4141
- https://conda.anaconda.org/robostack-staging/
4242

4343
packages_select_by_deps:
44+
- spatio_temporal_voxel_layer
4445
# only subset of packages to reduce maintainer load
4546

4647
# build 7 reselect

vinca_linux_aarch64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ skip_existing:
3939
# - /home/ubuntu/micromamba/envs/devenv/conda-bld/
4040

4141
packages_select_by_deps:
42+
- spatio_temporal_voxel_layer
4243
# only subset of packages to reduce maintainer load
4344
- ros2-controllers
4445
- diff-drive-controller

0 commit comments

Comments
 (0)