Skip to content

Commit 219b64d

Browse files
committed
- dependencies fixed. (Pull requests #26)
1 parent 09d5494 commit 219b64d

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

robotis_controller/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ find_package(catkin REQUIRED COMPONENTS
1414
roslib
1515
sensor_msgs
1616
std_msgs
17-
robotis_device
1817
robotis_controller_msgs
1918
robotis_framework_common
2019
cmake_modules
21-
dynamixel_sdk
2220
)
2321

2422
################################################################################
@@ -35,7 +33,7 @@ find_package(catkin REQUIRED COMPONENTS
3533
catkin_package(
3634
INCLUDE_DIRS include
3735
LIBRARIES robotis_controller
38-
CATKIN_DEPENDS roscpp roslib sensor_msgs std_msgs
36+
CATKIN_DEPENDS roscpp roslib sensor_msgs std_msgs robotis_framework_common
3937
)
4038

4139
################################################################################

robotis_controller/package.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,13 @@
1616
<build_depend>roslib</build_depend>
1717
<build_depend>std_msgs</build_depend>
1818
<build_depend>sensor_msgs</build_depend>
19-
<build_depend>dynamixel_sdk</build_depend>
20-
<build_depend>robotis_device</build_depend>
2119
<build_depend>robotis_controller_msgs</build_depend>
2220
<build_depend>robotis_framework_common</build_depend>
2321
<run_depend>roscpp</run_depend>
2422
<run_depend>roslib</run_depend>
2523
<run_depend>std_msgs</run_depend>
2624
<run_depend>sensor_msgs</run_depend>
27-
<run_depend>dynamixel_sdk</run_depend>
28-
<run_depend>robotis_device</run_depend>
2925
<run_depend>robotis_controller_msgs</run_depend>
30-
<export></export>
26+
<run_depend>robotis_framework_common</run_depend>
27+
<export></export>
3128
</package>

robotis_framework_common/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
2525
################################################################################
2626
catkin_package(
2727
INCLUDE_DIRS include
28-
# LIBRARIES robotis_framework_common
28+
LIBRARIES robotis_framework_common
2929
CATKIN_DEPENDS roscpp robotis_device
3030
)
3131

@@ -36,6 +36,12 @@ include_directories(
3636
include
3737
${catkin_INCLUDE_DIRS}
3838
)
39+
add_library(${PROJECT_NAME}
40+
include/${PROJECT_NAME}/motion_module.h
41+
include/${PROJECT_NAME}/sensor_module.h
42+
include/${PROJECT_NAME}/singleton.h
43+
)
44+
set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
3945

4046
################################################################################
4147
# Install

0 commit comments

Comments
 (0)