* Fixes : DynamixelSDK ROS Indigo Issue - target_sources func in CMake

Author: LeonJung

ReleaseNote.txt

@@ -5,6 +5,7 @@
 - ..2017
 
 * Added : Deprecated is now being shown by attributes #67 #107
+* Fixes : DynamixelSDK ROS Indigo Issue - target_sources func in CMake
 * Fixes : Bug in protocol1_packet_handler.cpp, line 222 checking the returned Error Mask #120
 * Fixes : Packet Handlers - array param uint8_t to uint16_t to avoid closure loop when the packet is too long to be in uint8_t appropriately
 * Fixes : Group Syncwrite using multiple ports in c library issue solved (test code is also in this issue bulletin) #124

c++/CHANGELOG.rst

@@ -5,6 +5,7 @@ Changelog for package dynamixel_sdk
 3.5.4 (2017--)
 -----------
 * Added : Deprecated is now being shown by attributes #67 #107
+* Fixes : DynamixelSDK ROS Indigo Issue - target_sources func in CMake
 * Fixes : Bug in protocol1_packet_handler.cpp, line 222 checking the returned Error Mask #120
 * Fixes : Packet Handlers - array param uint8_t to uint16_t to avoid closure loop when the packet is too long to be in uint8_t appropriately
 * Fixes : Group Syncwrite using multiple ports in c library issue solved (test code is also in this issue bulletin) #124

c++/CMakeLists.txt

@@ -35,25 +35,30 @@ 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
-)
-
 if(APPLE)
-  target_sources(dynamixel_sdk PRIVATE src/dynamixel_sdk/port_handler_mac.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
+    src/dynamixel_sdk/port_handler_mac.cpp
+  )
 else()
-  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") 
-    set_property(TARGET dynamixel_sdk APPEND PROPERTY SOURCES src/dynamixel_sdk/port_handler_linux.cpp)
-  else()
-    target_sources(dynamixel_sdk PRIVATE src/dynamixel_sdk/port_handler_linux.cpp)
-  endif()
+  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
+    src/dynamixel_sdk/port_handler_linux.cpp
+  )
 endif()
 
 add_dependencies(dynamixel_sdk ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})