updated catkin config for ugv_sdk

This commit is contained in:
Ruixiang Du
2020-10-23 11:53:13 +08:00
parent 11f1836362
commit 2c188ba8b3
2 changed files with 16 additions and 2 deletions

View File

@@ -67,6 +67,14 @@ if(BUILD_WITHOUT_ROS)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
endif() endif()
if(NOT BUILD_WITHOUT_ROS)
find_package(catkin REQUIRED COMPONENTS wrp_io)
include_directories(
include
${catkin_INCLUDE_DIRS}
)
endif()
# Build libraries # Build libraries
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@@ -81,7 +89,11 @@ add_library(${PROJECT_NAME}
src/scout_can_parser.c src/scout_can_parser.c
src/scout_uart_parser.c src/scout_uart_parser.c
) )
if(BUILD_WITHOUT_ROS)
target_link_libraries(${PROJECT_NAME} wrp_io Threads::Threads) 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 target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
@@ -184,7 +196,7 @@ else() # BUILD_WITHOUT_ROS
catkin_package( catkin_package(
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include INCLUDE_DIRS include
# CATKIN_DEPENDS rospy scout_msgs std_msgs CATKIN_DEPENDS wrp_io
# DEPENDS system_lib # DEPENDS system_lib
) )

View File

@@ -14,5 +14,7 @@
<url type="repository">https://github.com/westonrobot/ugv_sdk</url> <url type="repository">https://github.com/westonrobot/ugv_sdk</url>
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<build_depend>wrp_io</build_depend>
<run_depend>wrp_io</run_depend>
<export></export> <export></export>
</package> </package>