mirrors/ugv_sdk
1
0
Fork 0
mirror of https://github.com/westonrobot/ugv_sdk synced 2023-04-08 06:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

replaced wrp_io with async_port

Browse Source
This commit is contained in:
pinloon.lee
2021-03-31 14:30:47 +08:00
parent e7fdfd3e4a
commit 91836551fe
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -67,7 +67,9 @@ 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) if(BUILD_WITHOUT_ROS)
find_package(async_port REQUIRED)
else()
find_package(catkin REQUIRED COMPONENTS async_port) find_package(catkin REQUIRED COMPONENTS async_port)
include_directories( include_directories(
include include
@@ -80,7 +82,7 @@ find_package(Threads REQUIRED)
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
# agx common # agx common
src/mobile_base.cpp src/agilex_base.cpp
src/agx_msg_parser.c src/agx_msg_parser.c
# robot support # robot support
src/scout_base.cpp src/scout_base.cpp
@@ -89,7 +91,7 @@ add_library(${PROJECT_NAME}
# src/bunker_base.cpp # src/bunker_base.cpp
) )
if(BUILD_WITHOUT_ROS) if(BUILD_WITHOUT_ROS)
target_link_libraries(${PROJECT_NAME} wrp_io Threads::Threads) target_link_libraries(${PROJECT_NAME} westonrobot::async_port Threads::Threads)
else() else()
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} Threads::Threads) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} Threads::Threads)
endif() endif()
@@ -195,7 +197,7 @@ else() # BUILD_WITHOUT_ROS
catkin_package( catkin_package(
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include INCLUDE_DIRS include
CATKIN_DEPENDS wrp_io CATKIN_DEPENDS async_port
# DEPENDS system_lib # DEPENDS system_lib
) )

4
package.xml
View File

@@ -14,7 +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> <build_depend>async_port</build_depend>
<run_depend>wrp_io</run_depend> <run_depend>async_port</run_depend>
<export></export> <export></export>
</package> </package>