update hieplm

robot_protocol_msgs/CMakeLists.txt

@@ -4,6 +4,28 @@ project(robot_protocol_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_protocol_msgs with Catkin")
+
+else()
+  set(BUILDING_WITH_CATKIN FALSE)
+  message(STATUS "Building robot_protocol_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
+  catkin_package(
+    INCLUDE_DIRS include
+    LIBRARIES robot_protocol_msgs
+    CATKIN_DEPENDS robot_std_msgs robot_geometry_msgs
+  )
+endif()
+
 # Thư viện header-only
 add_library(robot_protocol_msgs INTERFACE)
 
@@ -18,16 +40,19 @@ target_include_directories(robot_protocol_msgs
 target_link_libraries(robot_protocol_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_protocol_msgs
   EXPORT robot_protocol_msgs-targets
   INCLUDES DESTINATION include # Cài đặt include
 )
 
-# --- Cài đặt headers ---
-install(DIRECTORY include/
-  DESTINATION include
-  FILES_MATCHING PATTERN "*.h"
-)
+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_protocol_msgs-targets thành file CMake module ---
 # --- Tạo file lib/cmake/robot_protocol_msgs/robot_protocol_msgs-targets.cmake ---

robot_protocol_msgs/package.xml

@@ -19,8 +19,8 @@
     
   <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>