update hieplm

robot_nav_msgs/CMakeLists.txt

@@ -4,6 +4,31 @@ project(robot_nav_msgs)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# ========================================================
+# Catkin specific configuration
+# ========================================================
+
+if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
+  set(BUILDING_WITH_CATKIN TRUE)
+  message(STATUS "Building robot_nav_msgs with Catkin")
+else()
+  set(BUILDING_WITH_CATKIN FALSE)
+  message(STATUS "Building robot_nav_msgs with Standalone CMake")
+endif()
+
+if(BUILDING_WITH_CATKIN)
+  find_package(catkin REQUIRED COMPONENTS robot_std_msgs robot_geometry_msgs)
+  ## The catkin_package macro generates cmake config files for your package
+  ## Note: Dependencies (robot_std_msgs, robot_geometry_msgs, etc.) are not Catkin packages,
+  ## they are built as CMake targets in the same workspace and will be available
+  ## when this package is built. They are linked via target_link_libraries instead of CATKIN_DEPENDS
+  catkin_package(
+    INCLUDE_DIRS include
+    # LIBRARIES không cần vì đây là header-only library
+    # CATKIN_DEPENDS không cần vì dependencies không phải Catkin packages
+  )
+endif()
+
 # Thư viện header-only
 add_library(robot_nav_msgs INTERFACE)
 
@@ -22,13 +47,22 @@ target_link_libraries(robot_nav_msgs INTERFACE
                       )
 
 # --- Cài đặt thư viện vào hệ thống khi chạy make install ---
+# Export target trong mọi trường hợp để các target khác có thể export và phụ thuộc vào nó
 install(TARGETS robot_nav_msgs
   EXPORT robot_nav_msgs-targets
   INCLUDES DESTINATION include # Cài đặt include
 )
 
-# --- Xuất export set robot_costmap_2dTargets thành file CMake module ---
-# --- Tạo file lib/cmake/robot_nav_msgs/robot_costmap_2dTargets.cmake ---
+if(NOT BUILDING_WITH_CATKIN)
+  # Install headers for standalone mode
+  install(DIRECTORY include/
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.h"
+  )
+endif()
+
+# --- Xuất export set robot_nav_msgs-targets thành file CMake module ---
+# --- Tạo file lib/cmake/robot_nav_msgs/robot_nav_msgs-targets.cmake ---
 # --- File này chứa cấu hình giúp project khác có thể dùng ---
 # --- Find_package(robot_nav_msgs REQUIRED) ---
 # --- Target_link_libraries(my_app PRIVATE robot_nav_msgs::robot_nav_msgs) ---

robot_nav_msgs/package.xml

@@ -1,9 +1,9 @@
 <package>
-  <name>robot_robot_nav_msgs</name>
+  <name>robot_nav_msgs</name>
   <version>0.7.10</version>
   <description>
-    robot_robot_nav_msgs is the second generation of the transform library, which lets
-    the user keep track of multiple coordinate frames over time. robot_robot_nav_msgs
+    robot_nav_msgs is the second generation of the transform library, which lets
+    the user keep track of multiple coordinate frames over time. robot_nav_msgs
     maintains the relationship between coordinate frames in a tree
     structure buffered in time, and lets the user transform points,
     vectors, etc between any two coordinate frames at any desired
@@ -15,12 +15,13 @@
   <maintainer email="tfoote@osrfoundation.org">Tully Foote</maintainer>
   <license>BSD</license>
 
-  <url type="website">http://www.ros.org/wiki/robot_robot_nav_msgs</url>
+  <url type="website">http://www.ros.org/wiki/robot_nav_msgs</url>
     
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>libconsole-bridge-dev</build_depend>
-
-  <run_depend>libconsole-bridge-dev</run_depend>
+  <build_depend>robot_std_msgs</build_depend>
+  <build_depend>robot_geometry_msgs</build_depend>
 
+  <run_depend>robot_std_msgs</run_depend>
+  <run_depend>robot_geometry_msgs</run_depend>
 </package>