solving iriutils dependency problems

CMakeLists.txt

@@ -8,6 +8,7 @@ find_package(catkin REQUIRED COMPONENTS roscpp)
 
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
+find_package(iriutils REQUIRED COMPONENTS system)
 
 
 ## Uncomment this if the package has a setup.py. This macro ensures
@@ -89,6 +90,7 @@ catkin_package(
 ## Your package locations should be listed before other locations
 include_directories(include)
 include_directories(${catkin_INCLUDE_DIRS})
+include_directories(${iriutils_INCLUDE_DIR})
 
 ## Declare a cpp library
 # add_library(iri_ros_tool
@@ -101,6 +103,7 @@ add_library(modules include/${PROJECT_NAME}/module_common.h include/${PROJECT_NA
 set_target_properties(modules PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(modules ${PROJECT_NAME})
 target_link_libraries(modules ${catkin_LIBRARIES})
+target_link_libraries(modules ${iriutils_LIBRARY})
 
 
 ## Declare a cpp executable

include/iri_ros_tools/module.h

@@ -9,9 +9,9 @@
 #include <dynamic_reconfigure/server.h>
 #include <dynamic_reconfigure/Reconfigure.h>
 
-#include "threadserver.h"
-#include "eventserver.h"
-#include "mutex.h"
+#include <iridrivers/threadserver.h>
+#include <iridrivers/eventserver.h>
+#include <iridrivers/mutex.h>
 
 #define MODULE_DEFAULT_RATE 10
 

include/iri_ros_tools/module_action.h

@@ -11,7 +11,7 @@
 #include <actionlib/client/simple_action_client.h>
 #include <actionlib/action_definition.h>
 
-#include "mutex.h"
+#include <iridrivers/mutex.h>
 
 #define     DEFAULT_ACTION_MAX_RETRIES     5
 #define     DEFAULT_ACTION_TIMEOUT         10

include/iri_ros_tools/module_exceptions.h

@@ -19,7 +19,7 @@
 #ifndef MODULE_EXCEPTIONS_H
 #define MODULE_EXCEPTIONS_H
 
-#include "exceptions.h"
+#include <iridrivers/exceptions.h>
 #include <string>
 
 const std::string module_exception_msg="[CModule class] - ";