From ccb33bfa84b934e261e5e2bfb5050c0e6b70cac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Thu, 9 Jan 2014 13:45:10 +0000
Subject: [PATCH] Added the catkin dependencies of the package and the run
dependencies.
---
CMakeLists.txt | 11 +++--------
package.xml | 4 +++-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ae30ce..d8c49b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,11 +11,6 @@ find_package(catkin REQUIRED)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
-# edit the following line to add all the source code files of the library
-SET(sources src/iri_base_driver.cpp)
-# edit the following line to add all the header files of the library
-SET(headers include/${PROJECT_NAME}/iri_base_driver.h include/${PROJECT_NAME}/iri_base_driver_node.h)
-
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
@@ -83,8 +78,8 @@ SET(headers include/${PROJECT_NAME}/iri_base_driver.h include/${PROJECT_NAME}/ir
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
INCLUDE_DIRS include
-# LIBRARIES foo
-# CATKIN_DEPENDS other_catkin_pkg
+ LIBRARIES ${PROJECT_NAME}
+ CATKIN_DEPENDS roscpp driver_base dynamic_reconfigure
# DEPENDS system_lib
)
@@ -101,7 +96,7 @@ INCLUDE_DIRECTORIES(include)
# add_library(foo
# src/${PROJECT_NAME}/foo.cpp
# )
-add_library(${PROJECT_NAME} ${sources})
+add_library(${PROJECT_NAME} src/iri_base_driver.cpp)
## Declare a cpp executable
# add_executable(foo_node src/foo_node.cpp)
diff --git a/package.xml b/package.xml
index cdd6a4a..937e342 100644
--- a/package.xml
+++ b/package.xml
@@ -39,7 +39,9 @@
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
+ <run_depend>roscpp</run_depend>
+ <run_depend>driver_base</run_depend>
+ <run_depend>dynamic_reconfigure</run_depend>
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
--
GitLab