From abfec57fc9832427deb8c00b8e07a8e414837f16 Mon Sep 17 00:00:00 2001
From: wep21 <daisuke.nishimatsu1021@gmail.com>
Date: Fri, 8 Nov 2024 15:02:08 +0900
Subject: [PATCH 1/3] build: switch to use system octomap

Signed-off-by: wep21 <daisuke.nishimatsu1021@gmail.com>
---
 grid_map_octomap/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grid_map_octomap/package.xml b/grid_map_octomap/package.xml
index 9baacd46..fa8a4ed6 100644
--- a/grid_map_octomap/package.xml
+++ b/grid_map_octomap/package.xml
@@ -16,7 +16,7 @@
   <build_depend>grid_map_cmake_helpers</build_depend>
 
   <depend>grid_map_core</depend>
-  <depend>octomap</depend>
+  <depend>liboctomap-dev</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_common</test_depend>

From 43807ef44cd60842244a556ade6096ad4a1d7172 Mon Sep 17 00:00:00 2001
From: wep21 <daisuke.nishimatsu1021@gmail.com>
Date: Fri, 8 Nov 2024 17:32:31 +0900
Subject: [PATCH 2/3] workaround to include conversions.h

Signed-off-by: wep21 <daisuke.nishimatsu1021@gmail.com>
---
 grid_map_demos/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/grid_map_demos/CMakeLists.txt b/grid_map_demos/CMakeLists.txt
index e64cf57e..1ca4547c 100644
--- a/grid_map_demos/CMakeLists.txt
+++ b/grid_map_demos/CMakeLists.txt
@@ -138,6 +138,16 @@ ament_target_dependencies(
   octomap_msgs
 )
 
+foreach(dir IN LISTS octomap_msgs_INCLUDE_DIRS)
+  if(dir MATCHES ".*octomap_msgs.*")
+    get_filename_component(PARENT "${dir}" DIRECTORY)
+    target_include_directories(octomap_to_gridmap_demo
+      PRIVATE
+        ${PARENT}
+    )
+  endif()
+endforeach()
+
 ament_target_dependencies(
   move_demo SYSTEM
   ${dependencies}

From 98fc2521bb8194418211cdd6b3ca83ab9d47b63b Mon Sep 17 00:00:00 2001
From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:10:12 +0900
Subject: [PATCH 3/3] remove workaround

---
 grid_map_demos/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/grid_map_demos/CMakeLists.txt b/grid_map_demos/CMakeLists.txt
index 1ca4547c..e64cf57e 100644
--- a/grid_map_demos/CMakeLists.txt
+++ b/grid_map_demos/CMakeLists.txt
@@ -138,16 +138,6 @@ ament_target_dependencies(
   octomap_msgs
 )
 
-foreach(dir IN LISTS octomap_msgs_INCLUDE_DIRS)
-  if(dir MATCHES ".*octomap_msgs.*")
-    get_filename_component(PARENT "${dir}" DIRECTORY)
-    target_include_directories(octomap_to_gridmap_demo
-      PRIVATE
-        ${PARENT}
-    )
-  endif()
-endforeach()
-
 ament_target_dependencies(
   move_demo SYSTEM
   ${dependencies}