From 1c1672d0c4c6be15e4b3030241b3999deef490c3 Mon Sep 17 00:00:00 2001 From: SCH Date: Fri, 9 Jun 2017 09:36:45 +0900 Subject: [PATCH] update for yaml-cpp dependencies --- robotis_controller/CMakeLists.txt | 7 ++++++- robotis_controller/package.xml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/robotis_controller/CMakeLists.txt b/robotis_controller/CMakeLists.txt index 6e1bbb3..491f965 100755 --- a/robotis_controller/CMakeLists.txt +++ b/robotis_controller/CMakeLists.txt @@ -19,6 +19,10 @@ find_package(catkin REQUIRED COMPONENTS cmake_modules ) +set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig") +find_package(PkgConfig) +pkg_check_modules(yaml_cpp yaml-cpp REQUIRED) + ################################################################################ # Declare ROS messages, services and actions ################################################################################ @@ -42,11 +46,12 @@ catkin_package( include_directories( include ${catkin_INCLUDE_DIRS} + ${yaml_cpp_INCLUDE_DIRS} ) add_library(robotis_controller src/robotis_controller/robotis_controller.cpp) add_dependencies(robotis_controller ${catkin_EXPORTED_TARGETS}) -target_link_libraries(robotis_controller yaml-cpp ${catkin_LIBRARIES}) +target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES}) ################################################################################ # Install diff --git a/robotis_controller/package.xml b/robotis_controller/package.xml index dcff20e..72a1c9a 100755 --- a/robotis_controller/package.xml +++ b/robotis_controller/package.xml @@ -21,6 +21,7 @@ robotis_controller_msgs robotis_framework_common cmake_modules + yaml-cpp roscpp roslib std_msgs @@ -30,5 +31,6 @@ robotis_controller_msgs robotis_framework_common cmake_modules + yaml-cpp