diff --git a/robotis_controller/CHANGELOG.rst b/robotis_controller/CHANGELOG.rst
index 002d663..5a4eb37 100755
--- a/robotis_controller/CHANGELOG.rst
+++ b/robotis_controller/CHANGELOG.rst
@@ -2,6 +2,27 @@
Changelog for package robotis_controller
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies
+* Contributors: SCH
+
+0.2.4 (2017-06-07)
+-----------
+* added cmake_modules in package.xml
+* Contributors: SCH
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* updated robotis_controller.cpp
+* changed to read control cycle from .robot file
+* Contributors: Zerom
+
0.2.1 (2016-11-23)
-----------
* Merge the changes and update
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 e2368e3..3ba70e6 100755
--- a/robotis_controller/package.xml
+++ b/robotis_controller/package.xml
@@ -1,7 +1,7 @@
robotis_controller
- 0.2.1
+ 0.2.5
The main package that controls THORMANG3.
@@ -20,6 +20,8 @@
robotis_device
robotis_controller_msgs
robotis_framework_common
+ cmake_modules
+ yaml-cpp
roscpp
roslib
std_msgs
@@ -28,5 +30,7 @@
robotis_device
robotis_controller_msgs
robotis_framework_common
+ cmake_modules
+ yaml-cpp
diff --git a/robotis_device/CHANGELOG.rst b/robotis_device/CHANGELOG.rst
index 20b2638..8a0f671 100755
--- a/robotis_device/CHANGELOG.rst
+++ b/robotis_device/CHANGELOG.rst
@@ -2,6 +2,25 @@
Changelog for package robotis_device
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.2.5 (2017-06-09)
+-----------
+* none
+
+0.2.4 (2017-06-07)
+-----------
+* none
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* added a deivce: OpenCR
+* changed to read control cycle from .robot file
+* Contributors: Zerom, Kayman
+
0.2.1 (2016-11-23)
-----------
* Merge the changes and update
@@ -26,6 +45,7 @@ Changelog for package robotis_device
0.1.1 (2016-08-18)
-----------
* updated the package information
+* Contributors: Zerom
0.1.0 (2016-08-12)
-----------
@@ -42,4 +62,4 @@ Changelog for package robotis_device
ConvertRadian2Value / ConvertValue2Radian function bug fixed.
* added code to support the gazebo simulator
* renewal
-* Contributors: ROBOTIS, ROBOTIS-zerom, pyo
+* Contributors: Zerom
diff --git a/robotis_device/package.xml b/robotis_device/package.xml
index 516770d..00fd5c1 100755
--- a/robotis_device/package.xml
+++ b/robotis_device/package.xml
@@ -1,7 +1,7 @@
robotis_device
- 0.2.1
+ 0.2.5
The package that manages device information of ROBOTIS robots.
This package is used when reading device information with the robot information file
diff --git a/robotis_framework/CHANGELOG.rst b/robotis_framework/CHANGELOG.rst
index 87f4509..59cfa8c 100755
--- a/robotis_framework/CHANGELOG.rst
+++ b/robotis_framework/CHANGELOG.rst
@@ -2,6 +2,28 @@
Changelog for package robotis_framework
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.2.5 (2017-06-09)
+-----------
+* updated for yaml-cpp dependencies (robotis_controller)
+* Contributors: SCH
+
+0.2.4 (2017-06-07)
+-----------
+* added cmake_modules in package.xml
+* Contributors: SCH
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* added a deivce: OpenCR
+* updated robotis_controller.cpp
+* changed to read control cycle from .robot file
+* Contributors: Zerom, Kayman
+
0.2.1 (2016-11-23)
-----------
* Merge the changes and update
diff --git a/robotis_framework/package.xml b/robotis_framework/package.xml
index 44a7089..5a661bc 100755
--- a/robotis_framework/package.xml
+++ b/robotis_framework/package.xml
@@ -1,7 +1,7 @@
robotis_framework
- 0.2.1
+ 0.2.5
ROS packages for the robotis_framework (meta package)
BSD
Zerom
diff --git a/robotis_framework_common/CHANGELOG.rst b/robotis_framework_common/CHANGELOG.rst
index fb68bac..a1adecf 100755
--- a/robotis_framework_common/CHANGELOG.rst
+++ b/robotis_framework_common/CHANGELOG.rst
@@ -2,6 +2,24 @@
Changelog for package robotis_framework_common
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.2.5 (2017-06-09)
+-----------
+* none
+
+0.2.4 (2017-06-07)
+-----------
+* none
+
+0.2.3 (2017-05-23)
+-----------
+* updated the cmake file for ros install
+* Contributors: SCH
+
+0.2.2 (2017-04-24)
+-----------
+* updated for other packages
+* Contributors: Zerom, Kayman
+
0.2.1 (2016-11-23)
-----------
* Merge the changes and update
diff --git a/robotis_framework_common/CMakeLists.txt b/robotis_framework_common/CMakeLists.txt
index d6ebb1c..ed263f9 100755
--- a/robotis_framework_common/CMakeLists.txt
+++ b/robotis_framework_common/CMakeLists.txt
@@ -46,6 +46,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
################################################################################
# Install
################################################################################
+install(TARGETS robotis_framework_common
+ ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+ LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+ RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)
diff --git a/robotis_framework_common/package.xml b/robotis_framework_common/package.xml
index 8f0a6c7..3b6194b 100755
--- a/robotis_framework_common/package.xml
+++ b/robotis_framework_common/package.xml
@@ -1,7 +1,7 @@
robotis_framework_common
- 0.2.1
+ 0.2.5
The package contains commonly used Headers for the ROBOTIS Framework.