BRSRI/bellande_humanoid_robot_intelligence_control_system_architecture
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into op3_demo/fix-CMakeLists

Browse Source
This commit is contained in:
Kayman 2017-10-11 17:20:46 +09:00 committed by GitHub
commit 3de6995b1f
3 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ball_detector/CMakeLists.txt
View File

@ -57,7 +57,7 @@ add_executable(ball_detector_node
src/ball_detector.cpp
src/ball_detector_node.cpp)
add_dependencies(ball_detector_node ${PROJECT_NAME}_gencfg)
add_dependencies(ball_detector_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(ball_detector_node
${catkin_LIBRARIES}
@ -68,38 +68,6 @@ target_link_libraries(ball_detector_node
# Install
################################################################################
# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# install(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
## Mark executables and/or libraries for installation
# install(TARGETS ball_detector ball_detector_node
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
## Mark cpp header files for installation
# install(DIRECTORY include/${PROJECT_NAME}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# FILES_MATCHING PATTERN "*.h"
# PATTERN ".svn" EXCLUDE
# )
## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )
################################################################################
# Test
################################################################################

1
op3_demo/CMakeLists.txt
View File

@ -14,6 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
ball_detector
op3_walking_module_msgs
op3_action_module_msgs
robotis_controller_msgs
cmake_modules
robotis_math
)

10
op3_demo/package.xml
View File

@ -10,19 +10,23 @@
<author email="kmjung@robotis.com">kayman</author>
<maintainer email="pyo@robotis.com">Pyo</maintainer>
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<build_depend>roslib</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>ball_detector</build_depend>
<build_depend>robotis_controller_msgs</build_depend>
<build_depend>op3_walking_module_msgs</build_depend>
<build_depend>op3_action_module_msgs</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>robotis_math</build_depend>
<build_depend>robotis_math</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>ball_detector</run_depend>
<run_depend>robotis_controller_msgs</run_depend>
<run_depend>op3_walking_module_msgs</run_depend>
<run_depend>op3_action_module_msgs</run_depend>
<run_depend>cmake_modules</run_depend>
<run_depend>robotis_math</run_depend>
</package>
</package>