Skip to content
Snippets Groups Projects
Commit e2f17a55 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Merge branch 'iri_fix' into 'master'

Iri fix

See merge request !2
parents 4b26948d 4c5f81b5
Branches master
No related tags found
1 merge request!2Iri fix
...@@ -6,7 +6,7 @@ project(iri_lidar_lite_driver) ...@@ -6,7 +6,7 @@ project(iri_lidar_lite_driver)
# ******************************************************************** # ********************************************************************
# Add catkin additional components here # Add catkin additional components here
# ******************************************************************** # ********************************************************************
find_package(catkin REQUIRED COMPONENTS iri_base_driver roscpp roslib sensor_msgs) find_package(catkin REQUIRED COMPONENTS iri_base_driver sensor_msgs)
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS thread)
...@@ -63,7 +63,7 @@ catkin_package( ...@@ -63,7 +63,7 @@ catkin_package(
# ******************************************************************** # ********************************************************************
# Add ROS and IRI ROS run time dependencies # Add ROS and IRI ROS run time dependencies
# ******************************************************************** # ********************************************************************
CATKIN_DEPENDS iri_base_driver roscpp roslib sensor_msgs CATKIN_DEPENDS iri_base_driver sensor_msgs
# ******************************************************************** # ********************************************************************
# Add system and labrobotica run time dependencies here # Add system and labrobotica run time dependencies here
# ******************************************************************** # ********************************************************************
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="1"> <package format="2">
<name>iri_lidar_lite_driver</name> <name>iri_lidar_lite_driver</name>
<version>0.0.0</version> <version>1.0.0</version>
<description>The iri_lidar_lite_driver package</description> <description>The iri_lidar_lite_driver package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag --> <!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: --> <!-- Example: -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> --> <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="asantamaria@iri.upc.edu">Angel Santamaria-Navarro</maintainer> <maintainer email="asantamaria@iri.upc.edu">Angel Santamaria-Navarro</maintainer>
<maintainer email="labrobotica@iri.upc.edu">labrobotica</maintainer>
<!-- One license tag required, multiple allowed, one license per tag --> <!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: --> <!-- Commonly used license strings: -->
...@@ -16,44 +16,49 @@ ...@@ -16,44 +16,49 @@
<license>LGPL</license> <license>LGPL</license>
<!-- Url tags are optional, but mutiple are allowed, one per tag --> <!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository --> <!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: --> <!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/iri_lidar_lite_driver</url> --> <!-- <url type="website">http://wiki.ros.org/iri_battery_monitor_driver</url> -->
<!-- Author tags are optional, mutiple are allowed, one per tag --> <!-- Author tags are optional, multiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be --> <!-- Authors do not have to be maintainers, but could be -->
<!-- Example: --> <!-- Example: -->
<!-- <author email="jane.doe@example.com">Jane Doe</author> --> <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
<author email="asantamaria@iri.upc.edu">Angel Santamaria-Navarro</author>
<!-- The *_depend tags are used to specify dependencies --> <!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies --> <!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: --> <!-- Examples: -->
<!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
<!-- <depend>roscpp</depend> -->
<!-- Note that this is equivalent to the following: -->
<!-- <build_depend>roscpp</build_depend> -->
<!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: --> <!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> --> <!-- <build_depend>message_generation</build_depend> -->
<!-- Use build_export_depend for packages you need in order to build against this package: -->
<!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: --> <!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> --> <!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: --> <!-- Use exec_depend for packages you need at runtime: -->
<!-- <run_depend>message_runtime</run_depend> --> <!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: --> <!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> --> <!-- <test_depend>gtest</test_depend> -->
<!-- Use doc_depend for packages you need only for building documentation: -->
<!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<build_depend>dynamic_reconfigure</build_depend> <depend>iri_base_driver</depend>
<build_depend>roscpp</build_depend> <!--<depend>battery_monitor</depend>-->
<build_depend>roslib</build_depend> <depend>sensor_msgs</depend>
<build_depend>iri_base_driver</build_depend>
<build_depend>sensor_msgs</build_depend>
<run_depend>dynamic_reconfigure</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
<run_depend>iri_base_driver</run_depend>
<run_depend>sensor_msgs</run_depend>
<!-- The export tag contains other, unspecified, tags --> <!-- The export tag contains other, unspecified, tags -->
<export> <export>
<!-- Other tools can request additional information be placed here --> <!-- Other tools can request additional information be placed here -->
</export> </export>
</package> </package>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment