From 2c188ba8b36e34c5210b05a11f834d115fd1a789 Mon Sep 17 00:00:00 2001
From: Ruixiang Du <ruixiang.du@westonrobot.com>
Date: Fri, 23 Oct 2020 11:53:13 +0800
Subject: [PATCH] updated catkin config for ugv_sdk

---
 ugv_sdk/CMakeLists.txt | 16 ++++++++++++++--
 ugv_sdk/package.xml    |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ugv_sdk/CMakeLists.txt b/ugv_sdk/CMakeLists.txt
index 27022f8..d025093 100755
--- a/ugv_sdk/CMakeLists.txt
+++ b/ugv_sdk/CMakeLists.txt
@@ -67,6 +67,14 @@ if(BUILD_WITHOUT_ROS)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 endif()
 
+if(NOT BUILD_WITHOUT_ROS)
+    find_package(catkin REQUIRED COMPONENTS wrp_io)
+    include_directories(
+        include
+        ${catkin_INCLUDE_DIRS}
+    )
+endif()
+
 # Build libraries
 find_package(Threads REQUIRED)
 
@@ -81,7 +89,11 @@ add_library(${PROJECT_NAME}
     src/scout_can_parser.c
     src/scout_uart_parser.c
 )
-target_link_libraries(${PROJECT_NAME} wrp_io Threads::Threads)
+if(BUILD_WITHOUT_ROS)
+    target_link_libraries(${PROJECT_NAME} wrp_io Threads::Threads)
+else()
+    target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} Threads::Threads)
+endif() 
 target_include_directories(${PROJECT_NAME} PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	$<INSTALL_INTERFACE:include>
@@ -184,7 +196,7 @@ else() # BUILD_WITHOUT_ROS
     catkin_package(
         LIBRARIES ${PROJECT_NAME}
         INCLUDE_DIRS include 
-        #  CATKIN_DEPENDS rospy scout_msgs std_msgs
+         CATKIN_DEPENDS wrp_io
         #  DEPENDS system_lib
     )
 
diff --git a/ugv_sdk/package.xml b/ugv_sdk/package.xml
index b154b70..6b8ca5d 100644
--- a/ugv_sdk/package.xml
+++ b/ugv_sdk/package.xml
@@ -14,5 +14,7 @@
   <url type="repository">https://github.com/westonrobot/ugv_sdk</url>
 
   <buildtool_depend>catkin</buildtool_depend> 
+  <build_depend>wrp_io</build_depend>
+  <run_depend>wrp_io</run_depend>
   <export></export>
 </package>