From 760784e730f25de8af5b5e3c7eebedff079a27e1 Mon Sep 17 00:00:00 2001
From: William Woodall <wjwwood@gmail.com>
Date: Fri, 13 Jan 2012 11:40:59 -0600
Subject: [PATCH] Updating ROS make system.

---
 include/serial/serial_listener.h |  2 +-
 serial_ros.cmake                 | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/include/serial/serial_listener.h b/include/serial/serial_listener.h
index 37fb8ef..0aebffa 100644
--- a/include/serial/serial_listener.h
+++ b/include/serial/serial_listener.h
@@ -209,7 +209,7 @@ class SerialListenerException : public std::exception {
   const std::string e_what_;
 public:
   SerialListenerException(const std::string e_what) : e_what_(e_what) {}
-  ~SerialListenerException() throw() {std::exception::~exception();}
+  ~SerialListenerException() throw() {}
 
   virtual const char* what() const throw() {
     std::stringstream ss;
diff --git a/serial_ros.cmake b/serial_ros.cmake
index 431e49e..0c69171 100644
--- a/serial_ros.cmake
+++ b/serial_ros.cmake
@@ -17,20 +17,29 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 #set the default path for built libraries to the "lib" directory
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-# Check for OS X and if so disable kqueue support in asio
-IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
-    add_definitions(-DBOOST_ASIO_DISABLE_KQUEUE)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES Darwin)
+include_directories(include)
+
+set(SERIAL_SRCS src/serial.cc)
+if(UNIX)
+  list(APPEND SERIAL_SRCS src/impl/unix.cc)
+else(UNIX)
+  list(APPEND SERIAL_SRCS src/impl/windows.cc)
+endif(UNIX)
+list(APPEND SERIAL_SRCS src/serial_listener.cc)
 
 # Build the serial library
-rosbuild_add_library(${PROJECT_NAME} src/serial.cpp include/serial/serial.h)
+rosbuild_add_library(${PROJECT_NAME} ${SERIAL_SRCS})
 
 # Add boost dependencies
 rosbuild_add_boost_directories()
 rosbuild_link_boost(${PROJECT_NAME} system filesystem thread)
 
 # Build example
-rosbuild_add_executable(serial_example examples/serial_example.cpp)
+rosbuild_add_executable(serial_example examples/serial_example.cc)
 target_link_libraries(serial_example ${PROJECT_NAME})
 
+rosbuild_add_executable(serial_listener_example
+  examples/serial_listener_example.cc)
+target_link_libraries(serial_listener_example ${PROJECT_NAME})
+
 endmacro(build_serial)