Merge pull request #139 from ROBOTIS-GIT/kinetic-devel

Kinetic devel
ROBOTIS-GIT · Oct 30, 2017 · 9703768 · 9703768
2 parents 0eb1e20 + f6c7eeb
commit 9703768
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 20 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "DynamixelSDK c++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.5.2
+PROJECT_NUMBER         = 3.5.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/README.md b/README.md
@@ -1,13 +1,12 @@
-![](https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/DynamixelSDK/Home/DYNAMIXEL_SDK_Logo.jpg)
-![](https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/DynamixelSDK/Home/DXL_SDK_image.jpg)
+![](https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/DynamixelSDK/Home/DYNAMIXEL_SDK.jpg)
 
 ### Software Release
 --------------------------------------------------------------------------
 | Dynamixel SDK Version | 1.X | 2.X | 3.X ([Download](https://github.com/ROBOTIS-GIT/DynamixelSDK/releases)) |
 | ------------- | ------------- | ------------- | ------------- |
 | Release date | 2010.05.16 | 2015.02.10 | 2016.03.08 |
-| Latest version released |||3.5.2|
-| |||(..)|
+| Latest version released |||3.5.3|
+| |||(2017.10.30)|
 | OS | Linux | Windows | Linux + Windows + Mac |
 | Available Dynamixel models | All models | All models | All models |
 |||||

diff --git a/ReleaseNote.txt b/ReleaseNote.txt
@@ -1,3 +1,11 @@
+==============================================
+    Dynamixel SDK 3.5.3 (Protocol 1.0/2.0)
+==============================================
+
+- 10.30.2017
+
+* Fixes : DynamixelSDK ROS Kinetic Issue - ARM - Debian Jessie solved by replacing target_sources func in CMake to set_property #136
+
 ==============================================
     Dynamixel SDK 3.5.2 (Protocol 1.0/2.0)
 ==============================================

diff --git a/c++/CHANGELOG.rst b/c++/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package dynamixel_sdk
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.5.3 (2017-10-30)
+-----------
+* Fixes : DynamixelSDK ROS Kinetic Issue - ARM - Debian Jessie solved by replacing target_sources func in CMake to set_property #136
+* Contributors: Leon
+
 3.5.2 (2017-09-18)
 -----------
 * Recover : Check if the id of rxpacket is the same as the id of txpacket #82

diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
@@ -35,20 +35,21 @@ include_directories(
   ${catkin_INCLUDE_DIRS}
 )
 
-  add_library(dynamixel_sdk
-    src/dynamixel_sdk/packet_handler.cpp
-    src/dynamixel_sdk/protocol1_packet_handler.cpp
-    src/dynamixel_sdk/protocol2_packet_handler.cpp
-    src/dynamixel_sdk/group_sync_read.cpp
-    src/dynamixel_sdk/group_sync_write.cpp
-    src/dynamixel_sdk/group_bulk_read.cpp
-    src/dynamixel_sdk/group_bulk_write.cpp
-    src/dynamixel_sdk/port_handler.cpp
-  )
+add_library(dynamixel_sdk
+  src/dynamixel_sdk/packet_handler.cpp
+  src/dynamixel_sdk/protocol1_packet_handler.cpp
+  src/dynamixel_sdk/protocol2_packet_handler.cpp
+  src/dynamixel_sdk/group_sync_read.cpp
+  src/dynamixel_sdk/group_sync_write.cpp
+  src/dynamixel_sdk/group_bulk_read.cpp
+  src/dynamixel_sdk/group_bulk_write.cpp
+  src/dynamixel_sdk/port_handler.cpp
+)
+
 if(APPLE)
-  target_sources(dynamixel_sdk PRIVATE src/dynamixel_sdk/port_handler_mac.cpp)
+  set_property(TARGET dynamixel_sdk APPEND PROPERTY SOURCES src/dynamixel_sdk/port_handler_mac.cpp)
 else()
-  target_sources(dynamixel_sdk PRIVATE src/dynamixel_sdk/port_handler_linux.cpp)
+  set_property(TARGET dynamixel_sdk APPEND PROPERTY SOURCES src/dynamixel_sdk/port_handler_linux.cpp)
 endif()
 
 add_dependencies(dynamixel_sdk ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

diff --git a/c++/library.properties b/c++/library.properties
@@ -1,5 +1,5 @@
 name=DynamixelSDK
-version=3.5.1
+version=3.5.3
 author=ROBOTIS
 maintainer=ROBOTIS
 sentence=DynamixelSDK for Arduino

diff --git a/c++/package.xml b/c++/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package>
   <name>dynamixel_sdk</name>
-  <version>3.5.2</version>
+  <version>3.5.3</version>
   <description>This package is wrapping version of ROBOTIS Dynamxel SDK for ROS. The ROBOTIS Dynamixel SDK, or SDK, is a software development library that provides Dynamixel control functions for packet communication. The API is designed for Dynamixel actuators and Dynamixel-based platforms.</description>
-  <license>BSD</license>
+  <license>Apache-2.0</license>
   <author email="[email protected]">Zerom</author>
   <author email="[email protected]">Leon</author>
   <maintainer email="[email protected]">Pyo</maintainer>