Use new lvr2 cmake targets. updated maintainers. increased patch version (#97)

amock · web-flow · commit e84123428f9a · 2026-01-23T21:23:50.000+01:00
diff --git a/README.md b/README.md
@@ -155,7 +155,6 @@ For the necessary localization of the robot relative to the mesh, we recommend u
 We are happy to receive improvements to the mesh navigation stack. Just open an issue. PRs are welcome!
 
 Maintainers:
-* [Matthias Holoch](mailto:matthias.holoch@naturerobots.com) (Nature Robots)
 * [Alexander Mock](https://github.com/amock) (Nature Robots)
 * [Justus Braun](https://github.com/justusbraun) (Osnabrück University)
 
diff --git a/cvp_mesh_planner/CHANGELOG.rst b/cvp_mesh_planner/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package cvp_mesh_planner
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 * Cost-aware planning
diff --git a/cvp_mesh_planner/CMakeLists.txt b/cvp_mesh_planner/CMakeLists.txt
@@ -14,19 +14,18 @@ find_package(mbf_msgs REQUIRED)
 find_package(mbf_utility REQUIRED)
 find_package(mesh_map REQUIRED)
 find_package(rclcpp REQUIRED)
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 
 pluginlib_export_plugin_description_file(mbf_mesh_core cvp_mesh_planner.xml)
 
 add_library(${PROJECT_NAME} src/cvp_mesh_planner.cpp)
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>
-  ${LVR2_INCLUDE_DIRS})
+  $<INSTALL_INTERFACE:include>)
 target_compile_definitions(${PROJECT_NAME} PRIVATE "CVP_MESH_PLANNER_BUILDING_LIBRARY")
 ament_target_dependencies(${PROJECT_NAME} mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp)
 target_link_libraries(${PROJECT_NAME} 
-    ${LVR2_LIBRARIES}
+    lvr2::lvr2
     ${MPI_CXX_LIBRARIES}
 )
 
diff --git a/cvp_mesh_planner/package.xml b/cvp_mesh_planner/package.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>cvp_mesh_planner</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The Continuous Vector Field Planner (CVP) mesh planner package</description>
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
-    <license>BSD 3-Clause</license>
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
+    <license>BSD-3-Clause</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
+    <author email="jubraun@uos.de">Justus Braun</author>
 
     <depend>rclcpp</depend>
     <depend>mbf_mesh_core</depend>
diff --git a/dijkstra_mesh_planner/CHANGELOG.rst b/dijkstra_mesh_planner/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dijkstra_mesh_planner
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 * Cost-aware planning
diff --git a/dijkstra_mesh_planner/CMakeLists.txt b/dijkstra_mesh_planner/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(mbf_msgs REQUIRED)
 find_package(mbf_utility REQUIRED)
 find_package(mesh_map REQUIRED)
 find_package(rclcpp REQUIRED)
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 
 pluginlib_export_plugin_description_file(mbf_mesh_core dijkstra_mesh_planner.xml)
 
@@ -24,11 +24,11 @@ add_library(${PROJECT_NAME}
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
-  ${LVR2_INCLUDE_DIRS})
+)
 target_compile_definitions(${PROJECT_NAME} PRIVATE "DIJKSTRA_MESH_PLANNER_BUILDING_LIBRARY")
 ament_target_dependencies(${PROJECT_NAME} mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp)
 target_link_libraries(${PROJECT_NAME} 
-    ${LVR2_LIBRARIES}
+    lvr2::lvr2
     ${MPI_CXX_LIBRARIES}
 )
 
diff --git a/dijkstra_mesh_planner/package.xml b/dijkstra_mesh_planner/package.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>dijkstra_mesh_planner</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The dijkstra_mesh_planner package</description>
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
-    <license>BSD-3</license>
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
+    <license>BSD-3-Clause</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
+    <author email="jubraun@uos.de">Justus Braun</author>
 
     <depend>rclcpp</depend>
     <depend>mbf_mesh_core</depend>
diff --git a/mbf_mesh_core/CHANGELOG.rst b/mbf_mesh_core/CHANGELOG.rst
@@ -1,6 +1,11 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Changelog for package mbf_mesh_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+
 3.0.0 (2025-09-10)
 ------------------
 
diff --git a/mbf_mesh_core/package.xml b/mbf_mesh_core/package.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>mbf_mesh_core</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The mbf_mesh_core package</description>
 
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
 
-    <license>BSD-3</license>
+    <license>BSD-3-Clause</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
+    <author email="jubraun@uos.de">Justus Braun</author>
 
     <depend>mbf_abstract_core</depend>
     <depend>mesh_map</depend>
diff --git a/mbf_mesh_nav/CHANGELOG.rst b/mbf_mesh_nav/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package mbf_mesh_nav
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 * Multi-threaded executor
diff --git a/mbf_mesh_nav/CMakeLists.txt b/mbf_mesh_nav/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(
   include
 )
 
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 find_package(MPI)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(JSONCPP jsoncpp)
@@ -52,11 +52,11 @@ add_library(mbf_mesh_server
 target_include_directories(mbf_mesh_server PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
-  ${LVR2_INCLUDE_DIRS})
+)
 ament_target_dependencies(mbf_mesh_server ${dependencies})
 target_link_libraries(mbf_mesh_server 
   ${JSONCPP_LIBRARIES}
-  ${LVR2_LIBRARIES}
+  lvr2::lvr2
   ${MPI_CXX_LIBRARIES}
 )
 
@@ -65,9 +65,9 @@ ament_target_dependencies(${PROJECT_NAME} ${dependencies} ${${PROJECT_NAME}_EXPO
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
-  ${LVR2_INCLUDE_DIRS})
+)
 target_link_libraries(${PROJECT_NAME}
-  ${LVR2_LIBRARIES}
+  lvr2::lvr2
   ${MPI_CXX_LIBRARIES}
   ${JSONCPP_LIBRARIES}
   mbf_mesh_server
diff --git a/mbf_mesh_nav/package.xml b/mbf_mesh_nav/package.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>mbf_mesh_nav</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The mbf_mesh_nav package</description>
 
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
 
-    <license>BSD-3</license>
+    <license>BSD-3-Clause</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
 
     <depend>geometry_msgs</depend>
     <depend>mbf_abstract_nav</depend>
diff --git a/mesh_controller/CHANGELOG.rst b/mesh_controller/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package mesh_controller
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 
diff --git a/mesh_controller/CMakeLists.txt b/mesh_controller/CMakeLists.txt
@@ -16,7 +16,7 @@ find_package(mbf_utility REQUIRED)
 find_package(mesh_map REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(tf2_geometry_msgs REQUIRED)
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 find_package(MPI)
 
 pluginlib_export_plugin_description_file(mbf_mesh_core mesh_controller.xml)
@@ -25,11 +25,11 @@ add_library(${PROJECT_NAME} src/mesh_controller.cpp)
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
-  ${LVR2_INCLUDE_DIRS})
+)
 target_compile_definitions(${PROJECT_NAME} PRIVATE "MESH_CONTROLLER_BUILDING_LIBRARY")
 ament_target_dependencies(${PROJECT_NAME} example_interfaces mbf_mesh_core mbf_msgs mbf_utility mesh_map rclcpp tf2_geometry_msgs)
 target_link_libraries(${PROJECT_NAME} 
-    ${LVR2_LIBRARIES}
+    lvr2::lvr2
     ${MPI_CXX_LIBRARIES}
 )
 
diff --git a/mesh_controller/package.xml b/mesh_controller/package.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>mesh_controller</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The mesh_controller package</description>
 
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
-    <license>BSD-3</license>
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
+    
+    <license>BSD-3-Clause</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
     <author email="sfrohn@uos.de">Sabrina Frohn</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
+    <author email="jubraun@uos.de">Justus Braun</author>
 
     <depend>mbf_mesh_core</depend>
     <depend>mbf_msgs</depend>
diff --git a/mesh_layers/CHANGELOG.rst b/mesh_layers/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package mesh_layers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 * Graph Layer System
diff --git a/mesh_layers/CMakeLists.txt b/mesh_layers/CMakeLists.txt
@@ -10,9 +10,8 @@ endif()
 
 find_package(ament_cmake_ros REQUIRED)
 find_package(mesh_map REQUIRED)
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 find_package(OpenMP)
-add_definitions(${LVR2_DEFINITIONS})
 
 pluginlib_export_plugin_description_file(mesh_map mesh_layers.xml)
 
@@ -29,18 +28,17 @@ add_library(${PROJECT_NAME}
 )
 include_directories(
   include
-  ${LVR2_INCLUDE_DIRS}
 )
 
 target_compile_features(${PROJECT_NAME} PUBLIC c_std_99 cxx_std_17)  # Require C99 and C++17
 target_include_directories(${PROJECT_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 
-ament_target_dependencies(${PROJECT_NAME} mesh_map LVR2)
+ament_target_dependencies(${PROJECT_NAME} mesh_map lvr2)
 target_compile_definitions(${PROJECT_NAME} PRIVATE "MESH_LAYERS_BUILDING_LIBRARY")
 target_link_libraries(${PROJECT_NAME}
-  ${LVR2_LIBRARIES}
+  lvr2::lvr2
   OpenMP::OpenMP_CXX
 )
 
diff --git a/mesh_layers/package.xml b/mesh_layers/package.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <package format="3">
     <name>mesh_layers</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <description>The mesh_layers package</description>
 
-    <maintainer email="matthias.holoch@naturerobots.com">Matthias Holoch</maintainer>
-    <maintainer email="sebastian.puetz@naturerobots.com">Sebastian Pütz</maintainer>
-
+    <maintainer email="alexander.mock@naturerobots.com">Alexander Mock</maintainer>
+    <maintainer email="jubraun@uos.de">Justus Braun</maintainer>
+    
     <license>BSD-3</license>
     <author email="spuetz@uos.de">Sebastian Pütz</author>
+    <author email="alexander.mock@naturerobots.com">Alexander Mock</author>
+    <author email="jubraun@uos.de">Justus Braun</author>
 
     <depend>mesh_map</depend>
     <depend>lvr2</depend>
diff --git a/mesh_map/CHANGELOG.rst b/mesh_map/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package mesh_map
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.0.1 (2026-08-15)
+------------------
+* Update maintainer information
+* Use lvr2 cmake targets
+
 3.0.0 (2025-09-10)
 ------------------
 * Graph Layer System
diff --git a/mesh_map/CMakeLists.txt b/mesh_map/CMakeLists.txt
@@ -25,15 +25,14 @@ foreach(dep IN LISTS dependencies)
   find_package(${dep} REQUIRED)
 endforeach()
 
-find_package(LVR2 REQUIRED)
+find_package(lvr2 REQUIRED)
 find_package(assimp REQUIRED)
 find_package(MPI)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(JSONCPP jsoncpp)
 
 include_directories(
   include
-  ${LVR2_INCLUDE_DIRS}
 )
 
 add_library(${PROJECT_NAME}
@@ -49,13 +48,13 @@ target_include_directories(${PROJECT_NAME} PUBLIC
   ${ASSIMP_INCLUDE_DIRS})
 ament_target_dependencies(${PROJECT_NAME} ${dependencies})
 target_link_libraries(${PROJECT_NAME} 
-    ${LVR2_LIBRARIES}
+    lvr2::lvr2
     ${ASSIMP_LIBRARIES}
 )
-target_compile_definitions(${PROJECT_NAME}
-  PUBLIC
-  ${LVR2_DEFINITIONS}
-)
+# target_compile_definitions(${PROJECT_NAME}
+#   PUBLIC
+#   ${LVR2_DEFINITIONS}
+# )
 
 install(DIRECTORY include/
   DESTINATION include
diff --git a/mesh_map/include/mesh_map/util.h b/mesh_map/include/mesh_map/util.h
diff --git a/mesh_map/package.xml b/mesh_map/package.xml
diff --git a/mesh_map/src/mesh_map.cpp b/mesh_map/src/mesh_map.cpp
diff --git a/mesh_navigation/CHANGELOG.rst b/mesh_navigation/CHANGELOG.rst
diff --git a/mesh_navigation/package.xml b/mesh_navigation/package.xml
diff --git a/source_dependencies.yaml b/source_dependencies.yaml
