Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
labrobotica
ros
iri_core
iri_ros_tools
Commits
e2dae169
Commit
e2dae169
authored
Oct 18, 2018
by
Sergi Hernandez
Browse files
Removed the dependency of the iriutils library.
parent
12577a60
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e2dae169
...
...
@@ -8,8 +8,6 @@ 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
## modules and global scripts declared therein get installed
...
...
@@ -90,7 +88,6 @@ 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
...
...
@@ -103,7 +100,6 @@ 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
View file @
e2dae169
...
...
@@ -9,9 +9,9 @@
#include
<dynamic_reconfigure/server.h>
#include
<dynamic_reconfigure/Reconfigure.h>
#include
<iridrivers/
threadserver.h
>
#include
<iridrivers/
eventserver.h
>
#include
<iridrivers/
mutex.h
>
#include
"
threadserver.h
"
#include
"
eventserver.h
"
#include
"
mutex.h
"
#define MODULE_DEFAULT_RATE 10
...
...
include/iri_ros_tools/module_action.h
View file @
e2dae169
...
...
@@ -11,7 +11,7 @@
#include
<actionlib/client/simple_action_client.h>
#include
<actionlib/action_definition.h>
#include
<iridrivers/
mutex.h
>
#include
"
mutex.h
"
#define DEFAULT_ACTION_MAX_RETRIES 5
#define DEFAULT_ACTION_TIMEOUT 10
...
...
include/iri_ros_tools/module_exceptions.h
View file @
e2dae169
...
...
@@ -19,7 +19,7 @@
#ifndef MODULE_EXCEPTIONS_H
#define MODULE_EXCEPTIONS_H
#include
<iridrivers/
exceptions.h
>
#include
"
exceptions.h
"
#include
<string>
const
std
::
string
module_exception_msg
=
"[CModule class] - "
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment