Merge pull request #16 from ROBOTIS-GIT/develop

Develop
ROBOTIS-GIT · Dec 5, 2018 · 5ba89f4 · 5ba89f4
2 parents 5f1bdba + f50c2c1
commit 5ba89f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/op3_gui_demo/launch/op3_demo_walking.launch b/op3_gui_demo/launch/op3_demo_walking.launch
@@ -7,5 +7,8 @@
     <remap from="/op3_demo/ik_target_pose" to="/pose_panel/pose" />
   </node>
 
+  <node pkg="op3_localization" type="op3_localization" name="op3_localization" output="screen">
+  </node>
+
   <include file="$(find op3_navigation)/launch/op3_footstep_planner.launch" />
 </launch>
diff --git a/op3_tuner_client/CMakeLists.txt b/op3_tuner_client/CMakeLists.txt
@@ -102,7 +102,7 @@ endif()
 include_directories(
   ${op3_tuner_client_INCLUDE_DIRECTORIES}
   ${catkin_INCLUDE_DIRS}
-  ${YAML_CPP_LIBRARIES}
+  ${YAML_CPP_INCLUDE_DIRS}
 )
 add_executable(${PROJECT_NAME} ${op3_tuner_client_SRCS} ${op3_tuner_client_MOCS} ${op3_tuner_client_UIS_H} ${op3_tuner_client_RCC})
 add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})