Skip to content

Commit 033e214

Browse files
JustusBraunJustusBraun
authored
Merge pull request #67 from naturerobots/update-lvr2
Maintainer update + lvr2 upgrade
2 parents 0677ae6 + c230a72 commit 033e214

10 files changed

Lines changed: 26 additions & 37 deletions

File tree

‎label_manager/CHANGELOG.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package label_manager
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.1.1 (2026-08-15)
6+
------------------
7+
* Update maintainer information
8+
59
2.1.0 (2025-08-11)
610
------------------
711
* Add MeshVertexCostsSparse and MeshVertexCostsSparseStamped messages

‎label_manager/package.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>label_manager</name>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<description>Serving and persisting label information</description>
7-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
8-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
9-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
107

8+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
9+
1110
<url type="website">http://wiki.ros.org/ros_mesh_tools/label_manager</url>
1211

1312
<author email="spuetz@uos.de">Sebastian Pütz</author>

‎mesh_msgs/package.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>mesh_msgs</name>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<description>Various Message Types for Mesh Data.</description>
7-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
8-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
9-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
7+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
108
<author email="spuetz@uos.de">Sebastian Pütz</author>
119
<author email="hdeeken@uos.de">Henning Deeken</author>
1210
<author email="jvogtherr@uos.de">Jan Philipp Vogtherr</author>

‎mesh_msgs_conversions/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,17 @@ find_package(rclcpp REQUIRED)
2222
find_package(mesh_msgs REQUIRED)
2323
find_package(sensor_msgs REQUIRED)
2424

25-
find_package(LVR2 REQUIRED)
25+
find_package(lvr2 REQUIRED)
2626
find_package(OpenCV REQUIRED)
2727
find_package(MPI REQUIRED)
2828
find_package(PkgConfig REQUIRED)
2929

30-
add_definitions(${LVR2_DEFINITIONS} ${OpenCV_DEFINITIONS})
30+
add_definitions(${OpenCV_DEFINITIONS})
3131

3232
# enable openmp support
3333
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
3434
include_directories(
3535
include
36-
${LVR2_INCLUDE_DIRS}
3736
${OpenCV_INCLUDE_DIRS}
3837
)
3938

@@ -46,7 +45,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
4645
$<INSTALL_INTERFACE:include>)
4746

4847
target_link_libraries(${PROJECT_NAME} PUBLIC
49-
${LVR2_LIBRARY}
48+
lvr2::lvr2
5049
${OpenCV_LIBRARIES}
5150
rclcpp::rclcpp
5251
${mesh_msgs_TARGETS}

‎mesh_msgs_conversions/package.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>mesh_msgs_conversions</name>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<description>converts point clouds and attributes into meshes and mesh attributes</description>
77

8-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
9-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
10-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
8+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
119

1210
<license>BSD 3-Clause</license>
1311
<author email="spuetz@uos.de">Sebastian Pütz</author>

‎mesh_msgs_transform/package.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>mesh_msgs_transform</name>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<description>Methods to transform mesh_msgs</description>
7-
<maintainer email="spuetz@uos.de">Sebastian Pütz</maintainer>
87
<license>BSD-3</license>
98
<url type="website">http://wiki.ros.org/ros_mesh_tools/mesh_msgs_transform</url>
10-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
11-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
12-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
9+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
1310
<author email="spuetz@uos.de">Sebastian Pütz</author>
1411

1512
<buildtool_depend>ament_cmake</buildtool_depend>

‎mesh_tools/package.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>mesh_tools</name>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<description>The mesh_tools package</description>
7-
<maintainer email="spuetz@uos.de">Sebastian Pütz</maintainer>
87
<license>BSD-3</license>
98
<url type="website">http://wiki.ros.org/mesh_tools</url>
10-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
11-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
12-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
9+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
1310
<author email="spuetz@uos.de">Sebastian Pütz</author>
1411

1512
<buildtool_depend>ament_cmake</buildtool_depend>

‎rviz_mesh_tools_plugins/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ find_package(HDF5 REQUIRED COMPONENTS C CXX HL)
3939

4040
# include_directories(${ASSIMP_INCLUDE_DIRS})
4141

42-
# LVR2 includes HighFive that we need here
42+
# lvr2 includes HighFive that we need here
4343
# - it was compiling before because globale lvr2 header were accessible
44-
find_package(LVR2 REQUIRED)
44+
find_package(lvr2 REQUIRED)
4545

4646
## This setting causes Qt's "MOC" generation to happen automatically.
4747
# set(CMAKE_AUTOMOC ON)
@@ -51,7 +51,6 @@ find_package(Qt5 COMPONENTS Core Widgets)
5151

5252
include_directories(
5353
include
54-
${LVR2_INCLUDE_DIRS}
5554
${Boost_INCLUDE_DIRS}
5655
${HDF5_INCLUDE_DIRS}
5756
)
@@ -87,8 +86,6 @@ set(MOC_HEADER_FILES
8786
include/rviz_mesh_tools_plugins/InteractionHelper.hpp
8887
)
8988

90-
add_definitions(${LVR2_DEFINITIONS})
91-
9289
add_library(${PROJECT_NAME} SHARED
9390
${SOURCE_FILES}
9491
${MOC_HEADER_FILES}
@@ -101,7 +98,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
10198
)
10299

103100
target_link_libraries(${PROJECT_NAME} PUBLIC
104-
${LVR2_LIBRARIES}
101+
lvr2::lvr2
105102
rviz_ogre_vendor::OgreMain
106103
rviz_ogre_vendor::OgreOverlay
107104
Boost::system

‎rviz_mesh_tools_plugins/package.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<description>
66
RViz display types and tools for the mesh_msgs package.
77
</description>
8-
<version>2.1.0</version>
9-
<maintainer email="amock@uos.de">Alexander Mock</maintainer>
10-
<maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
11-
<maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
8+
<version>2.1.1</version>
9+
10+
<maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
11+
1212
<author email="spuetz@uos.de">Sebastian Pütz</author>
1313
<author email="krschmidt@uos.de">Kristin Schmidt</author>
1414
<author email="jvogtherr@uos.de">Jan Philipp Vogtherr</author>

‎source_dependencies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Repositories in here contain dependencies of mesh_tools that are currently not avaiable via apt.
22
# Every repository listed here will get cloned and built during CI runs.
33
repositories:
4-
uos/lvr2:
4+
lvr2:
55
type: git
66
url: https://github.com/uos/lvr2.git
77
version: main

0 commit comments

Comments
 (0)